aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/app_base.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-24 19:32:49 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-24 19:33:07 -0200
commit4d157ea8c15186c4903fa83f2dc51a5f78d13a37 (patch)
tree80e2f4dbfe4346e889a68c33fbba205e39bec225 /railties/lib/rails/generators/app_base.rb
parent0349516ddbb712680b1b47ef160206946252a2d3 (diff)
parent8e1e9f6c70e626e51b158511fb9ef417f04e5397 (diff)
downloadrails-4d157ea8c15186c4903fa83f2dc51a5f78d13a37.tar.gz
rails-4d157ea8c15186c4903fa83f2dc51a5f78d13a37.tar.bz2
rails-4d157ea8c15186c4903fa83f2dc51a5f78d13a37.zip
Merge pull request #17752 from arthurnn/fix_sprockets-rails-dependency
Use sprockets-rails 2.2.x on base app and allow greater version
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
1 files changed, 0 insertions, 2 deletions
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