From 7cc30a98015f5932714ec32f96efafd9e7d6b332 Mon Sep 17 00:00:00 2001
From: Timo Schilling <timo@schilling.io>
Date: Tue, 28 Oct 2014 23:24:16 +0100
Subject: [PATCH] test with inherited_resources 1.5.x @ master

---
 Gemfile             | 3 +++
 activeadmin.gemspec | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 8e14a40270d..48c0b4b2338 100644
--- 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
index 15ef8ad9bd4..38f1948f1f5 100644
--- 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'