diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2019-07-01 09:56:09 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2019-07-01 09:56:09 +0000 |
| commit | 0e8b76e1918a7ca441e9eb98819f10da24e0588a (patch) | |
| tree | e8e9002a878bfeff66bf8fabfa808d170b3f3e26 /app/models | |
| parent | 8775e4a1faf13a01451e71ea9ef729dc52e6d3c1 (diff) | |
| parent | cb4a514207c914069410a01de8b493076156752a (diff) | |
| download | gitlab-ce-0e8b76e1918a7ca441e9eb98819f10da24e0588a.tar.gz | |
Merge branch 'zj-circuit-breaker-removal-part-deux' into 'master'
Remove ignored circuit_breaker columns
See merge request gitlab-org/gitlab-ce!30159
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/application_setting.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index cd645850af3..fbd8036653a 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -23,11 +23,6 @@ class ApplicationSetting < ApplicationRecord serialize :domain_blacklist, Array # rubocop:disable Cop/ActiveRecordSerialize serialize :repository_storages # rubocop:disable Cop/ActiveRecordSerialize - ignore_column :circuitbreaker_failure_count_threshold - ignore_column :circuitbreaker_failure_reset_time - ignore_column :circuitbreaker_storage_timeout - ignore_column :circuitbreaker_access_retries - ignore_column :circuitbreaker_check_interval ignore_column :koding_url ignore_column :koding_enabled ignore_column :sentry_enabled |