aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-09-18 08:40:46 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2016-09-25 21:31:46 +0200
commit47e4795060ee8550e28f86cedd4654fad19f72a4 (patch)
tree4f325af5b4e895f4c8b58c095b3049342a77837e /railties
parentefd808755cac74f0001907a1d635856160d11f6a (diff)
downloadrails-47e4795060ee8550e28f86cedd4654fad19f72a4.tar.gz
rails-47e4795060ee8550e28f86cedd4654fad19f72a4.tar.bz2
rails-47e4795060ee8550e28f86cedd4654fad19f72a4.zip
Apply Rafaels review fixes.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/command/behavior.rb2
-rw-r--r--railties/lib/rails/commands/server/server_command.rb4
-rw-r--r--railties/lib/rails/test_unit/minitest_plugin.rb1
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"