diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/command/behavior.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/server/server_command.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/test_unit/minitest_plugin.rb | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/rails/command/behavior.rb b/railties/lib/rails/command/behavior.rb index 1d7bab6ab2..ce994746a4 100644 --- a/railties/lib/rails/command/behavior.rb +++ b/railties/lib/rails/command/behavior.rb @@ -21,7 +21,7 @@ module Rails # This code is based directly on the Text gem implementation. # Copyright (c) 2006-2013 Paul Battley, Michael Neumann, Tim Fletcher. # - # Returns a value representing the "cost" of transforming str1 into str2 + # Returns a value representing the "cost" of transforming str1 into str2. def levenshtein_distance(str1, str2) s = str1 t = str2 diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb index 98605b05b2..4349dfdc71 100644 --- a/railties/lib/rails/commands/server/server_command.rb +++ b/railties/lib/rails/commands/server/server_command.rb @@ -90,7 +90,9 @@ module Rails end def default_options - super.merge( Port: ENV.fetch("PORT", 3000).to_i, + super.merge( + Port: ENV.fetch("PORT", 3000).to_i, + Host: ENV.fetch("HOST", "localhost").dup, DoNotReverseLookup: true, environment: (ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development").dup, daemonize: false, diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb index e294f2de83..6e196a32ab 100644 --- a/railties/lib/rails/test_unit/minitest_plugin.rb +++ b/railties/lib/rails/test_unit/minitest_plugin.rb @@ -1,5 +1,4 @@ require "active_support/core_ext/module/attribute_accessors" -require "active_support/core_ext/hash/keys" require "rails/test_unit/reporter" require "rails/test_unit/test_requirer" require "shellwords" |