diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-25 22:46:53 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-25 22:46:53 -0700 |
| commit | badc72f3e645b4176b04a4f5181a7f8a04a32f09 (patch) | |
| tree | 573ef62a8f3607eeeea651abd55de8535a2fdc38 | |
| parent | bf9272b9d42656efc2fd935c6a4108c8e0f306d0 (diff) | |
| parent | 60ca8d95938eddd2e9a54fb1167fd636e510b914 (diff) | |
| download | rails-badc72f3e645b4176b04a4f5181a7f8a04a32f09.tar.gz rails-badc72f3e645b4176b04a4f5181a7f8a04a32f09.tar.bz2 rails-badc72f3e645b4176b04a4f5181a7f8a04a32f09.zip | |
Merge pull request #1315 from ardavis/master
Removed unnecessary space in application.rb
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index caa9c1016c..7972c72c1e 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -128,7 +128,7 @@ module Rails end def comment_if(value) - options[value] ? '#' : '' + options[value] ? '# ' : '' end def rails_gemfile_entry diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index a097c77391..37c2fb1263 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -4,7 +4,7 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' <% else -%> # Pick the frameworks you want: -<%= comment_if :skip_active_record %> require "active_record/railtie" +<%= comment_if :skip_active_record %>require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" require "active_resource/railtie" |