X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/141df02e671d7c559f6d813bde1d792a159f1875..c7ed8a9e8604b207e24e0899a811ff3cdb2e7c3f:/config/application.rb diff --git a/config/application.rb b/config/application.rb index a8a13c476..3b470bacc 100644 --- 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"