aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-08-08 15:10:31 -0400
committerGitHub <noreply@github.com>2017-08-08 15:10:31 -0400
commit21c9c5782e0eaf00769e01164e73d3fa6d3709ac (patch)
tree5346e312df76dc825120534e254437815266d6a2 /railties/lib/rails
parent1422e9f9c90462c10d1b0abe6f63f4f6639a8bc3 (diff)
parentf2173648938b418d120f5a68d8f3862d8ae9dace (diff)
downloadrails-21c9c5782e0eaf00769e01164e73d3fa6d3709ac.tar.gz
rails-21c9c5782e0eaf00769e01164e73d3fa6d3709ac.tar.bz2
rails-21c9c5782e0eaf00769e01164e73d3fa6d3709ac.zip
Merge pull request #30127 from y-yagi/deprecate_support_of_older_config_ru
Deprecate support of older `config.ru`
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/commands/server/server_command.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb
index ce258341f6..de69b4586b 100644
--- a/railties/lib/rails/commands/server/server_command.rb
+++ b/railties/lib/rails/commands/server/server_command.rb
@@ -2,6 +2,8 @@ require "fileutils"
require "optparse"
require "action_dispatch"
require "rails"
+require "active_support/deprecation"
+require "active_support/core_ext/string/filters"
require_relative "../../dev_caching"
module Rails
@@ -18,10 +20,15 @@ module Rails
set_environment
end
- # TODO: this is no longer required but we keep it for the moment to support older config.ru files.
def app
@app ||= begin
app = super
+ if app.is_a?(Class)
+ ActiveSupport::Deprecation.warn(<<-MSG.squish)
+ Use `Rails::Application` subclass to start the server is deprecated and will be removed in Rails 6.0.
+ Please change `run #{app}` to `run Rails.application` in config.ru.
+ MSG
+ end
app.respond_to?(:to_app) ? app.to_app : app
end
end