aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/actions.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-10-16 01:08:18 -0300
committerJosé Valim <jose.valim@gmail.com>2009-10-16 01:08:18 -0300
commit9ba83cce0318fa5051764f4a16c286adf30169e2 (patch)
treeb1158e6916d69687c1b3e003aa97534a9135f460 /railties/lib/rails/generators/actions.rb
parent8b340ab2f62bac2af9d5917e296bb4101530282a (diff)
parentef70ad5538c4ce02c4d31ef01a8db6b55c837571 (diff)
downloadrails-9ba83cce0318fa5051764f4a16c286adf30169e2.tar.gz
rails-9ba83cce0318fa5051764f4a16c286adf30169e2.tar.bz2
rails-9ba83cce0318fa5051764f4a16c286adf30169e2.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails/generators/actions.rb')
-rw-r--r--railties/lib/rails/generators/actions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index c4552dd399..9254f8d918 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -71,7 +71,7 @@ module Rails
in_root do
if options[:env].nil?
- inject_into_file 'config/environment.rb', "\n #{data}", :after => sentinel, :verbose => false
+ inject_into_file 'config/application.rb', "\n #{data}", :after => sentinel, :verbose => false
else
Array.wrap(options[:env]).each do|env|
append_file "config/environments/#{env}.rb", "\n#{data}", :verbose => false