diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-23 23:56:43 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-24 00:03:13 -0300 |
| commit | 33e52d379e9379cc1a6b9afbb1f650f5ad56074d (patch) | |
| tree | 5bebba8da9452fef046df2a6bc17d301478fb545 /railties/lib/rails | |
| parent | a1a4957a63bf102c5be667e948cf50f92fba6c3d (diff) | |
| download | rails-33e52d379e9379cc1a6b9afbb1f650f5ad56074d.tar.gz rails-33e52d379e9379cc1a6b9afbb1f650f5ad56074d.tar.bz2 rails-33e52d379e9379cc1a6b9afbb1f650f5ad56074d.zip | |
Explicit options should have precedence over railsrc on the `rails new`
command
Closes #8545
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/commands/application.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb index ff0eda3413..2d9708e5b5 100644 --- a/railties/lib/rails/commands/application.rb +++ b/railties/lib/rails/commands/application.rb @@ -14,8 +14,7 @@ else extra_args_string = File.open(railsrc).read extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten puts "Using #{extra_args.join(" ")} from #{railsrc}" - ARGV << extra_args - ARGV.flatten! + ARGV.insert(1, *extra_args) end end |