Merge branch 'next-minor'v0.7.18.0

1 files changed, 20 insertions, 54 deletions

diff --git a/config/application.rb b/config/application.rb
index 50524a735..9b1c1050b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'boot'
+require_relative "boot"
 
-require 'rails/all'
+require "rails/all"
 
 require_relative "bundler_helper"
 
@@ -10,63 +10,39 @@ require_relative "bundler_helper"
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups(BundlerHelper.database))
 
-# Do not dump the limit of boolean fields on MySQL,
-# since that generates a db/schema.rb that's incompatible
-# with PostgreSQL
-require 'active_record/connection_adapters/abstract_mysql_adapter'
-module ActiveRecord
-  module ConnectionAdapters
-    class Mysql2Adapter < AbstractMysqlAdapter
-      def prepare_column_options(column, *_)
-        super.tap {|spec|
-          spec.delete(:limit) if column.type == :boolean
-        }
-      end
-    end
-  end
-end
-
 # Load asset_sync early
 require_relative 'asset_sync'
 
 module Diaspora
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.1
+    config.load_defaults 6.1
+
+    # Use classic autoloader for now
+    config.autoloader = :classic
 
-    # 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.
+    # 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")
 
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths      += %W[#{config.root}/app]
     config.autoload_once_paths += %W[#{config.root}/lib]
 
-    # 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 ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # 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 the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    # Allow to decode Time from serialized columns
+    config.active_record.yaml_column_permitted_classes = [Time]
 
     # Enable escaping HTML in JSON.
     config.active_support.escape_html_entities_in_json = true
 
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
+    # We specify CSRF protection manually in ApplicationController with
+    # protect_from_forgery - having it enabled anywhere by default breaks
+    # federation.
+    config.action_controller.default_protect_from_forgery = false
 
     # Enable the asset pipeline
     config.assets.enabled = true
@@ -74,16 +50,8 @@ module Diaspora
     # Speed up precompile by not loading the environment
     config.assets.initialize_on_precompile = false
 
-    # Precompile additional assets.
-    # (application.js, application.css, and all non-JS/CSS in the app/assets are already added)
-    config.assets.precompile = %w[
-      color_themes/*/desktop.css
-      color_themes/*/mobile.css
-      manifest.js
-    ]
-
     # See lib/tasks/assets.rake: non_digest_assets
-    config.assets.non_digest_assets = %w(branding/logos/asterisk.png)
+    config.assets.non_digest_assets = %w[branding/logos/asterisk.png]
 
     # Configure generators values. Many other options are available, be sure to check the documentation.
     config.generators do |g|
@@ -98,8 +66,6 @@ module Diaspora
     }
     config.action_mailer.asset_host = AppConfig.pod_uri.to_s
 
-    config.action_view.raise_on_missing_translations = true
-
     config.middleware.use Rack::OAuth2::Server::Resource::Bearer, "OpenID Connect" do |req|
       Api::OpenidConnect::OAuthAccessToken
         .valid(Time.zone.now.utc).find_by(token: req.access_token) || req.invalid_token!