diff --git a/Gemfile b/Gemfile index e8b52112..36f9efc3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ gemspec gem 'mocha' gem 'minitest-rg' +gem 'railties', '~> 4.2.0' group :test do gem 'strong_parameters' diff --git a/Gemfile.lock b/Gemfile.lock index ad002052..f846d29d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,56 +2,73 @@ PATH remote: . specs: inherited_resources (1.5.1) - actionpack (>= 3.2, < 4.2) + actionpack (>= 3.2, <= 4.2) has_scope (~> 0.6.0.rc) - railties (>= 3.2, < 4.2) - responders (~> 1.0) + railties (>= 3.2, <= 4.2) + responders (~> 2.0) GEM remote: https://rubygems.org/ specs: - actionpack (4.1.5) - actionview (= 4.1.5) - activesupport (= 4.1.5) - rack (~> 1.5.2) + actionpack (4.2.0) + actionview (= 4.2.0) + activesupport (= 4.2.0) + rack (~> 1.6.0) rack-test (~> 0.6.2) - actionview (4.1.5) - activesupport (= 4.1.5) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + actionview (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.5) - activesupport (= 4.1.5) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + activemodel (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) - activesupport (4.1.5) - i18n (~> 0.6, >= 0.6.9) + activesupport (4.2.0) + i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) builder (3.2.2) erubis (2.7.0) has_scope (0.6.0.rc) actionpack (>= 3.2, < 5) activesupport (>= 3.2, < 5) - i18n (0.6.11) + i18n (0.7.0) json (1.8.1) + loofah (2.0.1) + nokogiri (>= 1.5.9) metaclass (0.0.4) - minitest (5.4.1) + mini_portile (0.6.2) + minitest (5.5.0) minitest-rg (5.1.0) minitest (~> 5.0) mocha (1.1.0) metaclass (~> 0.0.1) - rack (1.5.2) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) + rack (1.6.0) rack-test (0.6.2) rack (>= 1.0) - railties (4.1.5) - actionpack (= 4.1.5) - activesupport (= 4.1.5) + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.5) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.1) + loofah (~> 2.0) + railties (4.2.0) + actionpack (= 4.2.0) + activesupport (= 4.2.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.2) - responders (1.1.1) - railties (>= 3.2, < 4.2) + rake (10.4.2) + responders (2.0.2) + railties (>= 4.2.0.alpha, < 5) strong_parameters (0.1.4) actionpack (>= 3.2.0) activemodel (>= 3.2.0) @@ -68,4 +85,5 @@ DEPENDENCIES inherited_resources! minitest-rg mocha + railties (~> 4.2.0) strong_parameters diff --git a/inherited_resources.gemspec b/inherited_resources.gemspec index 8575cc39..06e9fcb6 100644 --- a/inherited_resources.gemspec +++ b/inherited_resources.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.add_dependency("responders", "~> 2.0") - s.add_dependency("actionpack", ">= 3.2", "< 4.2") - s.add_dependency("railties", ">= 3.2", "< 4.2") + s.add_dependency("actionpack", ">= 3.2", "<= 4.2") + s.add_dependency("railties", ">= 3.2", "<= 4.2") s.add_dependency("has_scope", "~> 0.6.0.rc") end