aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-23 12:09:11 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-23 12:09:11 -0300
commit68d7a1e3f2e131541881ed41cd5b1cdf169c4fe8 (patch)
treecee454699a42e0076ae6e137ec8621bfc1dc817d /railties
parentf04dd33f330c96cdcf0b7a3728a9c2502db6a4c2 (diff)
parent21e68853fd7470eada2b970e58e5d8ed05098246 (diff)
downloadrails-68d7a1e3f2e131541881ed41cd5b1cdf169c4fe8.tar.gz
rails-68d7a1e3f2e131541881ed41cd5b1cdf169c4fe8.tar.bz2
rails-68d7a1e3f2e131541881ed41cd5b1cdf169c4fe8.zip
Merge pull request #12070 from wangjohn/small_refactors_to_generators
Small refactoring changes to generators. Conflicts: railties/lib/rails/generators/rails/controller/controller_generator.rb
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index cce11ba8bc..92c876c835 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -335,7 +335,7 @@ module Rails
def handle_rails_rc!
unless argv.delete("--no-rc")
- insert_railsrc(railsrc)
+ insert_railsrc_into_argv!(railsrc)
end
end
@@ -347,7 +347,7 @@ module Rails
end
end
- def insert_railsrc(railsrc)
+ def insert_railsrc_into_argv!(railsrc)
if File.exist?(railsrc)
extra_args_string = File.read(railsrc)
extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten