X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f3e3a6cc4b72120f856e14f3039b1c0c1f0326bd..HEAD:/services/api/config/application.rb

diff --git a/services/api/config/application.rb b/services/api/config/application.rb
index b28ae0e071..716383f203 100644
--- a/services/api/config/application.rb
+++ b/services/api/config/application.rb
@@ -2,44 +2,26 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-require_relative 'boot'
+require_relative "boot"
 
 require "rails"
-# Pick only the frameworks we need:
+# Pick the frameworks you want:
 require "active_model/railtie"
 require "active_job/railtie"
 require "active_record/railtie"
+# require "active_storage/engine"
 require "action_controller/railtie"
 require "action_mailer/railtie"
+# require "action_mailbox/engine"
+# require "action_text/engine"
 require "action_view/railtie"
+# require "action_cable/engine"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
-# Skipping the following:
-# * ActionCable (new in Rails 5.0) as it adds '/cable' routes that we're not using
-# * ActiveStorage (new in Rails 5.1)
 
-require 'digest'
-
-module Kernel
-  def suppress_warnings
-    verbose_orig = $VERBOSE
-    begin
-      $VERBOSE = nil
-      yield
-    ensure
-      $VERBOSE = verbose_orig
-    end
-  end
-end
-
-if defined?(Bundler)
-  suppress_warnings do
-    # If you precompile assets before deploying to production, use this line
-    Bundler.require(*Rails.groups(:assets => %w(development test)))
-    # If you want your assets lazily compiled in production, use this line
-    # Bundler.require(:default, :assets, Rails.env)
-  end
-end
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
 
 if ENV["ARVADOS_RAILS_LOG_TO_STDOUT"]
   Rails.logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
@@ -47,38 +29,29 @@ end
 
 module Server
   class Application < Rails::Application
-    # The following is to avoid SafeYAML's warning message
-    SafeYAML::OPTIONS[:default_mode] = :safe
 
     require_relative "arvados_config.rb"
 
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
+    # Initialize configuration defaults for specified Rails version.
+    config.load_defaults 7.0
 
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+    #
+    # config.time_zone = "Central Time (US & Canada)"
+    # config.eager_load_paths << Rails.root.join("extras")
 
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+    # We use db/structure.sql instead of db/schema.rb.
     config.active_record.schema_format = :sql
 
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Load entire application at startup.
     config.eager_load = true
 
     config.active_support.test_order = :sorted
 
+    # container_request records can contain arbitrary data structures
+    # in mounts.*.content, so rails must not munge them.
     config.action_dispatch.perform_deep_munge = false
 
     # force_ssl's redirect-to-https feature doesn't work when the
@@ -86,7 +59,10 @@ module Server
     # from connecting to Rails internally via plain http.
     config.ssl_options = {redirect: false}
 
-    I18n.enforce_available_locales = false
+    # This will change to 7.0 in a future release when there is no
+    # longer a possibility of rolling back to Arvados 2.7 (Rails 5.2)
+    # which cannot read 7.0-format cache files.
+    config.active_support.cache_format_version = 6.1
 
     # Before using the filesystem backend for Rails.cache, check
     # whether we own the relevant directory. If we don't, using it is