diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
| commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
| tree | dc4d20fe6064752c0bd323187252c77e0a89144b /config/initializers_before_autoloader | |
| parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) | |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'config/initializers_before_autoloader')
| -rw-r--r-- | config/initializers_before_autoloader/000_inflections.rb | 1 | ||||
| -rw-r--r-- | config/initializers_before_autoloader/002_sidekiq.rb | 2 |
2 files changed, 2 insertions, 1 deletions
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 |