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

Use sprockets-rails 2.2.x on base app and allow greater version

rails.gemspec

@@ -28,5 +28,5 @@
   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

railties/lib/rails/generators/app_base.rb

@@ -239,8 +239,6 @@ def assets_gemfile_entry
 
         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