diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-09-10 17:03:14 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-09-10 17:03:14 -0300 |
| commit | cfe77ce4a3494b9c1516fe7e915f76b21a68e763 (patch) | |
| tree | cef43c4d6c2fdee57ad19ab6815e41617eace2f2 /app/models/application_setting.rb | |
| parent | 934d4925d85f22c67e7ad57f607e8fe430a9ea92 (diff) | |
| parent | 95d16dc007f3fe8831f2baa511bbb7bd708baff0 (diff) | |
| download | gitlab-ce-cfe77ce4a3494b9c1516fe7e915f76b21a68e763.tar.gz | |
Merge remote-tracking branch 'origin/master' into camilstaps/gitlab-ce-new-66023-public-private-fork-counts
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index e39d655325f..a2cf081375e 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -31,15 +31,6 @@ class ApplicationSetting < ApplicationRecord serialize :repository_storages # rubocop:disable Cop/ActiveRecordSerialize serialize :asset_proxy_whitelist, Array # rubocop:disable Cop/ActiveRecordSerialize - self.ignored_columns += %i[ - clientside_sentry_dsn - clientside_sentry_enabled - koding_enabled - koding_url - sentry_dsn - sentry_enabled - ] - cache_markdown_field :sign_in_text cache_markdown_field :help_page_text cache_markdown_field :shared_runners_text, pipeline: :plain_markdown |