diff options
| author | Arthur Neves <arthurnn@gmail.com> | 2014-11-24 15:48:43 -0500 |
|---|---|---|
| committer | Arthur Neves <arthurnn@gmail.com> | 2014-11-24 16:30:26 -0500 |
| commit | 8e1e9f6c70e626e51b158511fb9ef417f04e5397 (patch) | |
| tree | ddeed53ff3c2a02c2e371766468cfbce35c23f36 | |
| parent | 2356714cc5447fc72998fe8a47657b04c41e6bf6 (diff) | |
| download | rails-8e1e9f6c70e626e51b158511fb9ef417f04e5397.tar.gz rails-8e1e9f6c70e626e51b158511fb9ef417f04e5397.tar.bz2 rails-8e1e9f6c70e626e51b158511fb9ef417f04e5397.zip | |
Fix sprockets-rails dependency dance
- Remove sprockets-rails from generated Gemfile as rails has a hard-dependency on it
- Also allow sprockets-rails >= 2.0.0
| -rw-r--r-- | rails.gemspec | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/rails.gemspec b/rails.gemspec index 99685252e0..cc1b8cb1a6 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', '~> 3.0.0.beta1' + s.add_dependency 'sprockets-rails', '>= 2.0.0' end diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 5f8c33c713..ec32bb8efc 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -239,8 +239,6 @@ module Rails gems = [] if options.dev? || options.edge? - gems << GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails', - 'Use edge version of sprockets-rails') gems << GemfileEntry.github('sass-rails', 'rails/sass-rails', 'Use SCSS for stylesheets') else |