diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 3 | ||||
| -rw-r--r-- | config/boot.rb | 2 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index ca252179a38..5804d8fd27b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -26,6 +26,9 @@ module Gitlab # setting disabled require_dependency Rails.root.join('lib/mysql_zero_date') + # This can be removed when we drop support for rails 4 + require_dependency Rails.root.join('lib/rails4_migration_version') + # 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. diff --git a/config/boot.rb b/config/boot.rb index 1aeacdabbad..725473ac7f6 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -12,5 +12,5 @@ require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) begin require 'bootsnap/setup' rescue LoadError - # bootsnap is optional dependency, so if we don't have it it's fine + # bootsnap is an optional dependency, so if we don't have it, it's fine end diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 565efc858d1..4210be2c701 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -20,6 +20,7 @@ Sidekiq.configure_server do |config| chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS'] && !enable_json_logs chain.add Gitlab::SidekiqMiddleware::Shutdown chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware unless ENV['SIDEKIQ_REQUEST_STORE'] == '0' + chain.add Gitlab::SidekiqMiddleware::BatchLoader chain.add Gitlab::SidekiqStatus::ServerMiddleware end |