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 | |
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')
-rw-r--r-- | railties/CHANGELOG.md | 4 | ||||
-rw-r--r-- | railties/lib/rails/commands/application.rb | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 3dd2944da3..88e08a29a6 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,5 +1,9 @@ ## Rails 4.0.0 (unreleased) ## +* Explicit options have precedence over `~/.railsrc` on the `rails new` command. + + *Rafael Mendonça França* + * Generated migrations now always use the `change` method. *Marc-André Lafortune* 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 |