mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #17752 from arthurnn/fix_sprockets-rails-dependency 

Use sprockets-rails 2.2.x on base app and allow greater version
This commit is contained in:
Rafael Mendonça França 2014-11-24 19:32:49 -02:00
parent 0349516ddb 8e1e9f6c70
commit 4d157ea8c1
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rails.gemspec
View File

@ -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'
end

2
railties/lib/rails/generators/app_base.rb
View File

@ -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