test with inherited_resources 1.5.x @ master

activeadmin · Oct 28, 2014 · 7cc30a9 · 7cc30a9
1 parent 0becbef
commit 7cc30a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -17,6 +17,9 @@ gem 'pundit'
 gem 'rake', require: false
 gem 'parallel_tests'
 
+# just to run the test on travis with inherited_resources master
+gem 'inherited_resources', github: 'josevalim/inherited_resources'
+
 group :development do
   # Debugging
   gem 'pry'                # Easily debug from your console with `binding.pry`

diff --git a/activeadmin.gemspec b/activeadmin.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'coffee-rails'
   s.add_dependency 'formtastic',          '~> 3.0'
   s.add_dependency 'formtastic_i18n'
-  s.add_dependency 'inherited_resources', '~> 1.4.1'
+  s.add_dependency 'inherited_resources', '> 1.4.1'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails',     '~> 5.0'
   s.add_dependency 'kaminari',            '~> 0.15'