From 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 19 Sep 2022 23:18:09 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-4-stable-ee --- config/initializers_before_autoloader/000_inflections.rb | 1 + config/initializers_before_autoloader/002_sidekiq.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'config/initializers_before_autoloader') diff --git a/config/initializers_before_autoloader/000_inflections.rb b/config/initializers_before_autoloader/000_inflections.rb index 70c9ec0a0ba..dfd33938611 100644 --- a/config/initializers_before_autoloader/000_inflections.rb +++ b/config/initializers_before_autoloader/000_inflections.rb @@ -37,6 +37,7 @@ ActiveSupport::Inflector.inflections do |inflect| vulnerabilities_feedback vulnerability_feedback ) + inflect.acronym 'CDN' inflect.acronym 'EE' inflect.acronym 'JH' inflect.acronym 'CSP' diff --git a/config/initializers_before_autoloader/002_sidekiq.rb b/config/initializers_before_autoloader/002_sidekiq.rb index 9ffcf39d6fb..929bdeda996 100644 --- a/config/initializers_before_autoloader/002_sidekiq.rb +++ b/config/initializers_before_autoloader/002_sidekiq.rb @@ -9,5 +9,5 @@ require 'sidekiq/web' if Rails.env.development? - Sidekiq.default_worker_options[:backtrace] = true + Sidekiq.default_job_options[:backtrace] = true end -- cgit v1.2.3