Merge branch 'serialize-renamed-application-setting-column' into 'master'

Serialize renamed application setting asset_proxy_whitelist See merge request gitlab-org/gitlab!53272

Merge branch 'serialize-renamed-application-setting-column' into 'master'
Serialize renamed application setting asset_proxy_whitelist See merge request gitlab-org/gitlab!53272
0f43c367 · Heinrich Lee Yu · e815729d · 463bc8cc · 0f43c367
Commit 0f43c367 authored Feb 03, 2021 by Heinrich Lee Yu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

app/models/application_setting.rb app/models/application_setting.rb +2 -0

No files found.
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -44,6 +44,8 @@ class ApplicationSetting < ApplicationRecord
  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_whitelist, Array # rubocop:disable Cop/ActiveRecordSerialize

  cache_markdown_field :sign_in_text
  cache_markdown_field :help_page_text