Skip to content

Commit

Permalink
No need to depend on sprocket-rails and sass-rails github repository
Browse files Browse the repository at this point in the history
  • Loading branch information
Rafael Mendonça França committed Nov 26, 2014
1 parent 1415d1e commit 3f18e46
Showing 1 changed file with 8 additions and 17 deletions.
25 changes: 8 additions & 17 deletions railties/lib/rails/generators/app_base.rb
Expand Up @@ -241,23 +241,14 @@ def convert_database_option_for_jruby
def assets_gemfile_entry
return [] if options[:skip_sprockets]

gems = []
if options.dev? || options.edge?
gems << GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails', '2-1-stable',
'Use latest 2.1 version of sprockets-rails')
gems << GemfileEntry.github('sass-rails', 'rails/sass-rails', nil,
'Use SCSS for stylesheets')
else
gems << GemfileEntry.version('sass-rails',
'~> 4.0.3',
'Use SCSS for stylesheets')
end

gems << GemfileEntry.version('uglifier',
'>= 1.3.0',
'Use Uglifier as compressor for JavaScript assets')

gems
[
GemfileEntry.version('sass-rails',
'~> 4.0.3',
'Use SCSS for stylesheets'),
GemfileEntry.version('uglifier',
'>= 1.3.0',
'Use Uglifier as compressor for JavaScript assets')
]
end

def jbuilder_gemfile_entry
Expand Down

0 comments on commit 3f18e46

Please sign in to comment.