X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0724ed1aeb25efc65668f3886ed4161da637bd0d..b3101110d47673231634fa2dee7afab2863de58f:/config/application.rb?ds=sidebyside

diff --git a/config/application.rb b/config/application.rb
index b801c8b5f..7b492aea0 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,18 +1,6 @@
 require_relative "boot"
 
-if ENV.fetch("OPENSTREETMAP_STATUS", nil) == "database_offline"
-  require "active_model/railtie"
-  require "active_job/railtie"
-  require "active_storage/engine"
-  require "action_controller/railtie"
-  require "action_mailer/railtie"
-  require "action_view/railtie"
-  require "action_cable/engine"
-  require "sprockets/railtie"
-  require "rails/test_unit/railtie"
-else
-  require "rails/all"
-end
+require "rails/all"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -21,7 +9,7 @@ Bundler.require(*Rails.groups)
 module OpenStreetMap
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.1
+    config.load_defaults 7.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
@@ -40,9 +28,6 @@ module OpenStreetMap
     # like if you have constraints or database-specific column types
     config.active_record.schema_format = :sql unless Settings.status == "database_offline"
 
-    # Don't eager load models when the database is offline
-    config.paths["app/models"].skip_eager_load! if Settings.status == "database_offline"
-
     # Use memcached for caching if required
     config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers)