diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-05 23:11:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-05 23:11:43 +0000 |
| commit | 13d327df4f3c52505bf8ec1144f2dedb6a351ad6 (patch) | |
| tree | 546e42fe159cde302b5e4d0b923d399e79bfbf71 /app/models/application_setting.rb | |
| parent | 9a70fcd2e277721bbe7b9a0c92ed925ddea201b6 (diff) | |
| download | gitlab-ce-13d327df4f3c52505bf8ec1144f2dedb6a351ad6.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-9-stable-ee
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 33c058dab96..4959401eb27 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -58,8 +58,9 @@ class ApplicationSetting < ApplicationRecord serialize :domain_allowlist, Array # rubocop:disable Cop/ActiveRecordSerialize serialize :domain_denylist, Array # rubocop:disable Cop/ActiveRecordSerialize serialize :repository_storages # rubocop:disable Cop/ActiveRecordSerialize - serialize :asset_proxy_allowlist, Array # rubocop:disable Cop/ActiveRecordSerialize + # See https://gitlab.com/gitlab-org/gitlab/-/issues/300916 + serialize :asset_proxy_allowlist, Array # rubocop:disable Cop/ActiveRecordSerialize serialize :asset_proxy_whitelist, Array # rubocop:disable Cop/ActiveRecordSerialize cache_markdown_field :sign_in_text |