Permalink
Browse files

Merge pull request #4717 from deivid-rodriguez/restore_1_9_3_plus_rai…

…ls_4_0_and_4_1_support

Restore 1.9.3 plus rails 4.0 and 4.1 support
  • Loading branch information...
2 parents 5f8a099 + ab9e1ed commit c99ac55b54053572778b15a1fd0af84fc0ae6d4c @timoschilling timoschilling committed on GitHub Jan 11, 2017
Showing with 20 additions and 11 deletions.
  1. +13 −9 .travis.yml
  2. +5 −1 Gemfile
  3. +2 −1 lib/active_admin/batch_actions/resource_extension.rb
View
@@ -2,6 +2,7 @@ language: ruby
sudo: false
install:
- ./script/travis_cache download_bundle
+ - gem update --system # use the very latest Rubygems
- gem install bundler # use the very latest Bundler
- bundle install --without development --path=./bundle
- bundle clean # delete now-outdated gems
@@ -11,24 +12,27 @@ install:
script:
- bundle exec rake test
rvm:
- - 1.9
- - 2.3.0
- - jruby-9.0.5.0
+ - 1.9.3
+ - 2.2.6
+ - 2.3.3
+ - jruby-9.1.6.0
env:
matrix:
- RAILS=3.2.22
- - RAILS=4.2.5
- - RAILS=5.0.0
+ - RAILS=4.0.13
+ - RAILS=4.1.16
+ - RAILS=4.2.7.1
+ - RAILS=5.0.1
global:
- JRUBY_OPTS="-J-Xmx1024m --debug"
matrix:
fast_finish: true
exclude:
- - rvm: 1.9
- env: RAILS=5.0.0
+ - rvm: 1.9.3
+ env: RAILS=5.0.1
allow_failures:
- - rvm: jruby-9.0.5.0
- env: RAILS=5.0.0
+ - rvm: jruby-9.1.6.0
+ env: RAILS=5.0.1
notifications:
irc:
channels:
View
@@ -43,7 +43,9 @@ gem 'pry' # Easily debug from your console wit
group :development do
# Debugging
- gem 'better_errors' # Web UI to debug exceptions. Go to /__better_errors to access the latest one
+ gem 'better_errors', # Web UI to debug exceptions. Go to /__better_errors to access the latest one
+ platforms: [:ruby_20, :ruby_21, :ruby_22, :ruby_23]
+
gem 'binding_of_caller', platforms: :mri # Retrieve the binding of a method's caller in MRI Ruby >= 1.9.2
# Performance
@@ -63,7 +65,9 @@ end
group :test do
gem 'capybara'
gem 'simplecov', require: false # Test coverage generator. Go to /coverage/ after running tests
+ gem 'json', '~> 1.8', require: false # Required by simplecov, > 2 removes support for Ruby 1.9
gem 'codecov', require: false # Test coverage website. Go to https://codecov.io
+ gem 'tins', '~> 1.6.0', require: false # Required by coveralls, > 1.6.0 removes support for Ruby 1.9
gem 'cucumber-rails', require: false
gem 'cucumber', '1.3.20'
gem 'database_cleaner'
@@ -55,7 +55,8 @@ def clear_batch_actions!
def batch_action_path(params = {})
path = [route_collection_path(params), "batch_action"].join("/")
query = params.slice(:q, :scope)
- query = query.permit!.to_h if query.respond_to? :permit!
+ query = query.permit! if query.respond_to? :permit!
+ query = query.to_h if Rails::VERSION::MAJOR >= 5
[path, query.to_param].reject(&:blank?).join("?")
end

0 comments on commit c99ac55

Please sign in to comment.