From 8e1e9f6c70e626e51b158511fb9ef417f04e5397 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Mon, 24 Nov 2014 15:48:43 -0500 Subject: 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 --- railties/lib/rails/generators/app_base.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'railties/lib/rails') 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 -- cgit v1.2.3