diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-11 19:05:37 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-11 19:05:37 +0000 |
| commit | c2f9f40e8892d316a27702eb5dbcabbe756efd0c (patch) | |
| tree | 9010111802c50ebcad804e7b2e3f472ca87214ca /config | |
| parent | 5dc5e2c78f8ee966db96ffe31887a90bce650437 (diff) | |
| download | gitlab-ce-c2f9f40e8892d316a27702eb5dbcabbe756efd0c.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-5-stable-ee
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 368036ce064..d7e16117d53 100644 --- a/config/application.rb +++ b/config/application.rb @@ -564,7 +564,8 @@ module Gitlab # Used in app/services/web_hooks/log_execution_service.rb: log_execution ActiveSupport::TimeWithZone, ActiveSupport::TimeZone, - Gitlab::Color # https://gitlab.com/gitlab-org/gitlab/-/issues/368844 + Gitlab::Color, # https://gitlab.com/gitlab-org/gitlab/-/issues/368844, + Hashie::Array # https://gitlab.com/gitlab-org/gitlab/-/issues/378089 ] # on_master_start yields immediately in unclustered environments and runs |