From 36ea8e6a3bb75753dd64032d1a8ebff0ffcdca68 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 30 Oct 2013 16:33:39 -0700 Subject: return argv from the insert method --- railties/lib/rails/generators/rails/app/app_generator.rb | 5 +++-- 1 file changed, 3 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 a4ab0a7fff..b6dbb11a34 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -351,7 +351,6 @@ module Rails argv.reject { |arg| arg == '--no-rc' } else insert_railsrc_into_argv!(argv, railsrc(argv)) - argv end end @@ -368,7 +367,9 @@ module Rails extra_args_string = File.read(railsrc) extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten puts "Using #{extra_args.join(" ")} from #{railsrc}" - argv.insert(1, *extra_args) + [argv.first] + extra_args + argv.drop(1) + else + argv end end end -- cgit v1.2.3