diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-13 17:14:14 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-13 17:14:14 +0200 |
| commit | e3273f5cce500ec19ceb4817daa3762753c5347b (patch) | |
| tree | c4ebc11e5895cd6aeb2eaeff4d44462f9557b0e8 /railties | |
| parent | 23aa7dacb559a8e2c578b641d615f7fb8cd7b900 (diff) | |
| download | rails-e3273f5cce500ec19ceb4817daa3762753c5347b.tar.gz rails-e3273f5cce500ec19ceb4817daa3762753c5347b.tar.bz2 rails-e3273f5cce500ec19ceb4817daa3762753c5347b.zip | |
Move the asset template engines to the user-generated Gemfile
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index facafb00c0..0e1c46bdf6 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -134,7 +134,6 @@ module Rails 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 @@ module Rails 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 diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index bcdb7a7cab..e5edb1a3cf 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -125,7 +125,7 @@ module Rails 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" diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 61daefef90..9ba21678fa 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/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' |