diff options
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/config/application.rb b/config/application.rb index 76541daa9e1..aa1a0b26d60 100644 --- a/config/application.rb +++ b/config/application.rb @@ -69,18 +69,19 @@ module Gitlab require_dependency Rails.root.join('lib/gitlab/middleware/handle_malformed_strings') require_dependency Rails.root.join('lib/gitlab/middleware/rack_multipart_tempfile_factory') require_dependency Rails.root.join('lib/gitlab/runtime') - require_dependency Rails.root.join('lib/gitlab/patch/legacy_database_config') + require_dependency Rails.root.join('lib/gitlab/patch/database_config') require_dependency Rails.root.join('lib/gitlab/exceptions_app') config.exceptions_app = Gitlab::ExceptionsApp.new(Rails.public_path) - # To be removed in 15.0 - # This preload is needed to convert legacy `database.yml` - # from `production: adapter: postgresql` - # into a `production: main: adapter: postgresql` - unless Gitlab::Utils.to_boolean(ENV['SKIP_DATABASE_CONFIG_VALIDATION'], default: false) - config.class.prepend(::Gitlab::Patch::LegacyDatabaseConfig) - end + # This preload is required to: + # + # 1. Convert legacy `database.yml`; + # 2. Include Geo post-deployment migrations settings; + # + # TODO: In 15.0, this preload can be wrapped in a Gitlab.ee block + # since we don't need to convert legacy `database.yml` anymore. + config.class.prepend(::Gitlab::Patch::DatabaseConfig) # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -313,6 +314,8 @@ module Gitlab config.assets.precompile << "themes/*.css" config.assets.precompile << "highlight/themes/*.css" + config.assets.precompile << "highlight/diff_custom_colors_addition.css" + config.assets.precompile << "highlight/diff_custom_colors_deletion.css" # Import gitlab-svgs directly from vendored directory config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist" @@ -514,6 +517,14 @@ module Gitlab end end + # We run the contents of active_record.clear_active_connections again + # because we connect to database from routes + # https://github.com/rails/rails/blob/fdf840f69a2e33d78a9d40b91d9b7fddb76711e9/activerecord/lib/active_record/railtie.rb#L308 + initializer :clear_active_connections_again, after: :set_routes_reloader_hook do + ActiveRecord::Base.clear_active_connections! + ActiveRecord::Base.flush_idle_connections! + end + # DO NOT PLACE ANY INITIALIZERS AFTER THIS. config.after_initialize do # on_master_start yields immediately in unclustered environments and runs |