Merge remote-tracking branch 'upstream/pull/2322'

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index a8a13c476466b4b1ea592991aa2de98787349513..3b470bacc5fc2759da6258fc3dd3badaffc26775 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,18 +1,5 @@
 require_relative "boot"
 
-# Guard against deployments with old-style application.yml configurations
-# Otherwise, admins might not be aware that they are now silently ignored
-# and major problems could occur
-# rubocop:disable Rails/Output, Rails/Exit
-if File.exist?(File.expand_path("application.yml", __dir__))
-  puts "The config/application.yml file is no longer supported"
-  puts "Default settings are now found in config/settings.yml and you can override these in config/settings.local.yml"
-  puts "To prevent unexpected behaviour, please copy any custom settings to config/settings.local.yml"
-  puts " and then remove your config/application.yml file."
-  exit!
-end
-# rubocop:enable Rails/Output, Rails/Exit
-
 if ENV["OPENSTREETMAP_STATUS"] == "database_offline"
   require "active_model/railtie"
   require "active_job/railtie"