Permalink
Browse files

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
  • Loading branch information...
2 parents f04dd33 + 21e6885 commit 68d7a1e3f2e131541881ed41cd5b1cdf169c4fe8 @rafaelfranca rafaelfranca committed Sep 23, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 railties/lib/rails/generators/rails/app/app_generator.rb
@@ -335,7 +335,7 @@ def handle_invalid_command!(argument)
def handle_rails_rc!
unless argv.delete("--no-rc")
- insert_railsrc(railsrc)
+ insert_railsrc_into_argv!(railsrc)
end
end
@@ -347,7 +347,7 @@ def railsrc
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

0 comments on commit 68d7a1e

Please sign in to comment.