diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-01 18:34:58 +0200 |
---|---|---|
committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-01 18:34:58 +0200 |
commit | 0cdcf98b772cf5c08a2bd74e8edbabe9b311b625 (patch) | |
tree | aca4c755b809145f9e3b7f1c3c3fd0cb563a3c6b | |
parent | f1a3d4876f625f342a84b5dd43f55274704c30f9 (diff) | |
parent | 6d02b75b2b0b372a0b762667cb39c1cbdcef12dd (diff) | |
download | rails-0cdcf98b772cf5c08a2bd74e8edbabe9b311b625.tar.gz rails-0cdcf98b772cf5c08a2bd74e8edbabe9b311b625.tar.bz2 rails-0cdcf98b772cf5c08a2bd74e8edbabe9b311b625.zip |
Merge pull request #21453 from claudiob/minimum-sprockets-2
Require sprockets-rails >= 2
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | rails.gemspec | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0c56999892..c151a82253 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,7 +139,7 @@ PATH activesupport (= 5.0.0.alpha) bundler (>= 1.3.0, < 2.0) railties (= 5.0.0.alpha) - sprockets-rails + sprockets-rails (>= 2.0.0) railties (5.0.0.alpha) actionpack (= 5.0.0.alpha) activesupport (= 5.0.0.alpha) diff --git a/rails.gemspec b/rails.gemspec index 52112680b2..0286af0a57 100644 --- a/rails.gemspec +++ b/rails.gemspec @@ -28,5 +28,5 @@ Gem::Specification.new do |s| s.add_dependency 'railties', version s.add_dependency 'bundler', '>= 1.3.0', '< 2.0' - s.add_dependency 'sprockets-rails' + s.add_dependency 'sprockets-rails', '>= 2.0.0' end |