diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-03-11 14:42:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-11 14:42:15 +0100 |
| commit | 2259b486f173e3259a9c3871803b6aecdd74b81f (patch) | |
| tree | 95921aff05d50277339696bf1838e6d518acae0a | |
| parent | 6ebd2e6d888259a5ef5a47da398840969d24a9cc (diff) | |
| parent | 4cdc93a1e449d8c81d3172f03adbd4288024883c (diff) | |
| download | rails-2259b486f173e3259a9c3871803b6aecdd74b81f.tar.gz rails-2259b486f173e3259a9c3871803b6aecdd74b81f.tar.bz2 rails-2259b486f173e3259a9c3871803b6aecdd74b81f.zip | |
Merge pull request #35569 from prathamesh-sonpatki/env-vars
Mention `environment variable` instead of just `environment`
| -rw-r--r-- | railties/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | railties/lib/rails/commands/server/server_command.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 9e8b38733a..88f9ac06f6 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -268,9 +268,9 @@ *Jose Luis Duran* -* Deprecate support for using the `HOST` environment to specify the server IP. +* Deprecate support for using the `HOST` environment variable to specify the server IP. - The `BINDING` environment should be used instead. + The `BINDING` environment variable should be used instead. Fixes #29516. diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb index 74adc967e5..a218393d59 100644 --- a/railties/lib/rails/commands/server/server_command.rb +++ b/railties/lib/rails/commands/server/server_command.rb @@ -221,8 +221,8 @@ module Rails if ENV["HOST"] && !ENV["BINDING"] ActiveSupport::Deprecation.warn(<<-MSG.squish) - Using the `HOST` environment to specify the IP is deprecated and will be removed in Rails 6.1. - Please use `BINDING` environment instead. + Using the `HOST` environment variable to specify the IP is deprecated and will be removed in Rails 6.1. + Please use `BINDING` environment variable instead. MSG return ENV["HOST"] |