Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/brendon/acts_as_list
Browse files Browse the repository at this point in the history
  • Loading branch information
brendon committed Apr 19, 2021
2 parents 474621f + 19a251f commit d4732a4
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 12 deletions.
33 changes: 28 additions & 5 deletions .travis.yml
Expand Up @@ -7,9 +7,11 @@ before_script:
- mysql -e 'create database acts_as_list;'
- psql -c 'create database acts_as_list;' -U postgres
rvm:
- 2.4.7
- 2.5.6
- 2.6.4
- 2.4
- 2.5
- 2.6
- 2.7
- 3.0
services:
- mysql
- postgresql
Expand All @@ -26,7 +28,28 @@ gemfile:
- gemfiles/rails_6_1.gemfile
matrix:
exclude:
- rvm: 2.4.7
- rvm: 2.4
gemfile: gemfiles/rails_6_0.gemfile
- rvm: 2.4.7
- rvm: 2.4
gemfile: gemfiles/rails_6_1.gemfile
# Ruby 2.7 uses a `bigdecimal` version that doesn't support BigDecimal.new
# that Rails 4.2 uses. See also:
# https://github.com/ruby/bigdecimal#which-version-should-you-select
- rvm: 2.7
gemfile: gemfiles/rails_4_2.gemfile
# Ruby 2.7 warning `sqlite3-1.3.13/lib/sqlite3/statement.rb:108: warning: rb_tainted_str_new is deprecated`
# and job wil exceed the maximum log length
# see also: https://github.com/sparklemotion/sqlite3-ruby/issues/276
- rvm: 2.7
gemfile: gemfiles/rails_5_0.gemfile
env: DB=sqlite
# Rails <6 does not support Ruby 3, see:
# https://github.com/rails/rails/issues/40938#issuecomment-751898275
- rvm: 3.0
gemfile: gemfiles/rails_4_2.gemfile
- rvm: 3.0
gemfile: gemfiles/rails_5_0.gemfile
- rvm: 3.0
gemfile: gemfiles/rails_5_1.gemfile
- rvm: 3.0
gemfile: gemfiles/rails_5_2.gemfile
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -20,7 +20,7 @@ group :sqlite do
end

group :postgresql do
gem "pg", "~> 1.1.4"
gem "pg", "~> 1.2.0"
end

group :mysql do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5_0.gemfile
Expand Up @@ -21,7 +21,7 @@ group :sqlite do
end

group :postgresql do
gem "pg", "~> 1.1.4"
gem "pg", "~> 1.2.0"
end

group :mysql do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5_1.gemfile
Expand Up @@ -21,7 +21,7 @@ group :sqlite do
end

group :postgresql do
gem "pg", "~> 1.1.4"
gem "pg", "~> 1.2.0"
end

group :mysql do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5_2.gemfile
Expand Up @@ -21,7 +21,7 @@ group :sqlite do
end

group :postgresql do
gem "pg", "~> 1.1.4"
gem "pg", "~> 1.2.0"
end

group :mysql do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6_0.gemfile
Expand Up @@ -21,7 +21,7 @@ group :sqlite do
end

group :postgresql do
gem "pg", "~> 1.1.4"
gem "pg", "~> 1.2.0"
end

group :mysql do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6_1.gemfile
Expand Up @@ -21,7 +21,7 @@ group :sqlite do
end

group :postgresql do
gem "pg", "~> 1.1.4"
gem "pg", "~> 1.2.0"
end

group :mysql do
Expand Down
2 changes: 1 addition & 1 deletion test/test_list.rb
Expand Up @@ -11,7 +11,7 @@ def setup_db(position_options = {})

# AR caches columns options like defaults etc. Clear them!
ActiveRecord::Base.connection.create_table :mixins do |t|
t.column :pos, :integer, position_options unless position_options[:positive] && sqlite
t.column :pos, :integer, **position_options unless position_options[:positive] && sqlite
t.column :active, :boolean, default: true
t.column :parent_id, :integer
t.column :parent_type, :string
Expand Down

0 comments on commit d4732a4

Please sign in to comment.