diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-27 13:39:07 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-27 13:39:07 -0300 |
| commit | 329c249c9aff0b2cd37e17086477514d1c5d7eac (patch) | |
| tree | bd7e1f5eddfeec6bfb7f4465e25ac82cba50e8e5 /railties/lib | |
| parent | 49b63cc455846c9d232f1a6d946d023d368615ad (diff) | |
| parent | 4dbacf26a9b5a886481ae39805ad0155724ae828 (diff) | |
| download | rails-329c249c9aff0b2cd37e17086477514d1c5d7eac.tar.gz rails-329c249c9aff0b2cd37e17086477514d1c5d7eac.tar.bz2 rails-329c249c9aff0b2cd37e17086477514d1c5d7eac.zip | |
Merge pull request #20712 from nhodges/dev/nh/20345
Remove `config` options from `default_options` in `railties`
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index c1bd4072ac..6289d4cc46 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -96,8 +96,7 @@ module Rails DoNotReverseLookup: true, environment: (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup, daemonize: false, - pid: File.expand_path("tmp/pids/server.pid"), - config: File.expand_path("config.ru") + pid: File.expand_path("tmp/pids/server.pid") }) end |