aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/rails/app/app_generator.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-10-30 16:25:51 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-10-30 16:25:51 -0700
commit22dafbb65800615e8a3f3a499091b8e33c3d39f7 (patch)
treeef16df6685bc155d857940416fdd4b5aa50d9555 /railties/lib/rails/generators/rails/app/app_generator.rb
parent4e0694c603099a2f76de8ad0f65c4f446a44dc4f (diff)
downloadrails-22dafbb65800615e8a3f3a499091b8e33c3d39f7.tar.gz
rails-22dafbb65800615e8a3f3a499091b8e33c3d39f7.tar.bz2
rails-22dafbb65800615e8a3f3a499091b8e33c3d39f7.zip
return argv from more methods
Diffstat (limited to 'railties/lib/rails/generators/rails/app/app_generator.rb')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb6
1 files changed, 4 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 6b59400f95..a4ab0a7fff 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -347,10 +347,12 @@ module Rails
end
def handle_rails_rc!(argv)
- unless argv.delete("--no-rc")
+ if argv.find { |arg| arg == '--no-rc' }
+ argv.reject { |arg| arg == '--no-rc' }
+ else
insert_railsrc_into_argv!(argv, railsrc(argv))
+ argv
end
- argv
end
def railsrc(argv)