From 1b42c847bc4d727f0c9c78f326ce2f34d22494da Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Fri, 7 Sep 2018 09:21:30 +0200 Subject: Fix rails 5 deprecation warnings Fixes rails 5 deprecation warnings in `config/` files --- config/application.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config/application.rb') diff --git a/config/application.rb b/config/application.rb index 76a2c47a750..fae92f6f372 100644 --- a/config/application.rb +++ b/config/application.rb @@ -19,6 +19,7 @@ module Gitlab require_dependency Rails.root.join('lib/gitlab/request_context') require_dependency Rails.root.join('lib/gitlab/current_settings') require_dependency Rails.root.join('lib/gitlab/middleware/read_only') + require_dependency Rails.root.join('lib/gitlab/middleware/basic_health_check') # This needs to be loaded before DB connection is made # to make sure that all connections have NO_ZERO_DATE @@ -159,7 +160,7 @@ module Gitlab # This middleware needs to precede ActiveRecord::QueryCache and other middlewares that # connect to the database. - config.middleware.insert_after "Rails::Rack::Logger", "Gitlab::Middleware::BasicHealthCheck" + config.middleware.insert_after Rails::Rack::Logger, ::Gitlab::Middleware::BasicHealthCheck config.middleware.insert_after Warden::Manager, Rack::Attack @@ -196,7 +197,7 @@ module Gitlab config.cache_store = :redis_store, caching_config_hash - config.active_record.raise_in_transactional_callbacks = true + config.active_record.raise_in_transactional_callbacks = true unless rails5? config.active_job.queue_adapter = :sidekiq -- cgit v1.2.3