Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move the asset template engines to the user-generated Gemfile

  • Loading branch information...
commit e3273f5cce500ec19ceb4817daa3762753c5347b 1 parent 23aa7da
@dhh dhh authored
View
2  railties/lib/rails/generators/app_base.rb
@@ -134,7 +134,6 @@ def rails_gemfile_entry
gem 'arel', :git => 'git://github.com/rails/arel.git'
gem 'rack', :git => 'git://github.com/rack/rack.git'
gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git"
- gem 'coffee-script'
gem 'json' # CoffeeScript and Sprockets dependency
GEMFILE
elsif options.edge?
@@ -143,7 +142,6 @@ def rails_gemfile_entry
gem 'arel', :git => 'git://github.com/rails/arel.git'
gem 'rack', :git => 'git://github.com/rack/rack.git'
gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git"
- gem 'coffee-script'
gem 'json' # CoffeeScript and Sprockets dependency
GEMFILE
else
View
2  railties/lib/rails/generators/rails/app/app_generator.rb
@@ -125,7 +125,7 @@ def vendor_javascripts
empty_directory_with_gitkeep "vendor/assets/javascripts"
else
copy_file "vendor/assets/javascripts/#{options[:javascript]}.js"
- copy_file "vendor/assets/javascripts/#{options[:javascript]}_ujs.js"
+ copy_file "vendor/assets/javascripts/#{options[:javascript]}_ujs.js", "vendor/assets/javascripts/rails.js"
if options[:javascript] == "prototype"
copy_file "vendor/assets/javascripts/controls.js"
View
4 railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -4,6 +4,10 @@ source 'http://rubygems.org'
<%= database_gemfile_entry -%>
+# Asset template engines
+gem 'coffee-script'
+gem 'sass'
+
# Use unicorn as the web server
# gem 'unicorn'

5 comments on commit e3273f5

@vijaydev
Collaborator

Wow Sass! Is there a Rails road-map where such decisions can be made known beforehand? Can't wait till the commits :-)

@jeremy
Owner

@vijaydev these commits are the road map ;)

@grimen

Was Compass ever considered? Just curious.

@shayfrendt

Pimp! New hotness.

@marcandre

+1 for compass. And what about haml?

Please sign in to comment.
Something went wrong with that request. Please try again.