aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2018-07-07 10:15:56 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2018-07-07 10:21:29 +0200
commit1d97b8f9e4ef0bbac093210c1e245c377ea30486 (patch)
tree3e4f585c048109c659249648da40d33d29f5282e /railties
parent161ed37d7120e1f391eed19e49a3390e53e4fe91 (diff)
downloadrails-1d97b8f9e4ef0bbac093210c1e245c377ea30486.tar.gz
rails-1d97b8f9e4ef0bbac093210c1e245c377ea30486.tar.bz2
rails-1d97b8f9e4ef0bbac093210c1e245c377ea30486.zip
Don't balloon @original_options with --restart on restart.
Our restart_command would pass in `--restart` which means that if the @original_options already contains --restart it would keep getting another --restart appended. Nothing here that would break the bank, but just a nicety.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/commands/server/server_command.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb
index 95ac497b2e..194db23f14 100644
--- a/railties/lib/rails/commands/server/server_command.rb
+++ b/railties/lib/rails/commands/server/server_command.rb
@@ -136,7 +136,7 @@ module Rails
def initialize(args, local_options, *)
super
- @original_options = local_options
+ @original_options = local_options - %w( --restart )
deprecate_positional_rack_server_and_rewrite_to_option(@original_options)
@log_stdout = options[:daemon].blank? && (options[:environment] || Rails.env) == "development"
end