aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorclaudiob <claudiob@gmail.com>2015-09-01 09:29:16 -0700
committerclaudiob <claudiob@gmail.com>2015-09-01 09:30:38 -0700
commit6d02b75b2b0b372a0b762667cb39c1cbdcef12dd (patch)
treeaca4c755b809145f9e3b7f1c3c3fd0cb563a3c6b
parentf1a3d4876f625f342a84b5dd43f55274704c30f9 (diff)
downloadrails-6d02b75b2b0b372a0b762667cb39c1cbdcef12dd.tar.gz
rails-6d02b75b2b0b372a0b762667cb39c1cbdcef12dd.tar.bz2
rails-6d02b75b2b0b372a0b762667cb39c1cbdcef12dd.zip
Require sprockets-rails >= 2
Fixes https://github.com/rails/rails/commit/4d157ea8c15186c4903fa83f2dc51a5f78d13a37 Without any specification about the version of sprockets-rails, running a `bundle install` on a brand new app might result in sprockets 0.0.1 being installed. However, the minimum requirement is sprockets-rails 2 (see https://github.com/rails/rails/pull/17752/files)
-rw-r--r--Gemfile.lock2
-rw-r--r--rails.gemspec2
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