diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-07-07 15:54:39 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-07-07 15:54:39 +0100 |
| commit | b8c4d5e0f552dc9986883bd9c8783c7f43f125ce (patch) | |
| tree | 06478887ace997e9b5735f797ddd64b7f028dc6d /app/models/application_setting.rb | |
| parent | 97611c88fcbae6b025750e6ebf2061a3d87d9753 (diff) | |
| parent | c88739ffa6ad99fbd5e20a6e8f2ee251996ea18b (diff) | |
| download | gitlab-ce-b8c4d5e0f552dc9986883bd9c8783c7f43f125ce.tar.gz | |
Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-group
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 4f9c7235a30..14516091495 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -13,13 +13,13 @@ class ApplicationSetting < ActiveRecord::Base [\r\n] # any number of newline characters }x - serialize :restricted_visibility_levels # rubocop:disable Cop/ActiverecordSerialize - serialize :import_sources # rubocop:disable Cop/ActiverecordSerialize - serialize :disabled_oauth_sign_in_sources, Array # rubocop:disable Cop/ActiverecordSerialize - serialize :domain_whitelist, Array # rubocop:disable Cop/ActiverecordSerialize - serialize :domain_blacklist, Array # rubocop:disable Cop/ActiverecordSerialize - serialize :repository_storages # rubocop:disable Cop/ActiverecordSerialize - serialize :sidekiq_throttling_queues, Array # rubocop:disable Cop/ActiverecordSerialize + serialize :restricted_visibility_levels # rubocop:disable Cop/ActiveRecordSerialize + serialize :import_sources # rubocop:disable Cop/ActiveRecordSerialize + serialize :disabled_oauth_sign_in_sources, Array # rubocop:disable Cop/ActiveRecordSerialize + serialize :domain_whitelist, Array # rubocop:disable Cop/ActiveRecordSerialize + serialize :domain_blacklist, Array # rubocop:disable Cop/ActiveRecordSerialize + serialize :repository_storages # rubocop:disable Cop/ActiveRecordSerialize + serialize :sidekiq_throttling_queues, Array # rubocop:disable Cop/ActiveRecordSerialize cache_markdown_field :sign_in_text cache_markdown_field :help_page_text |