diff options
author | Peter Leitzen <pleitzen@gitlab.com> | 2019-09-10 21:12:45 +0300 |
---|---|---|
committer | Peter Leitzen <pleitzen@gitlab.com> | 2019-09-10 21:12:45 +0300 |
commit | 62c30109cc90000d2cca030017b6f3a503df8aa2 (patch) | |
tree | d9f80d3b91259ffa1673559f700e9a24f2defad7 | |
parent | d7061cef98c10f5abef28e60dc764d4c3611c1bd (diff) | |
parent | 00e19736f974af157c3e090f729f0d591d1632d3 (diff) |
Merge branch 'remove-old-ignore-column' into 'master'
Remove some old `ignore_column` in AR models [CE]
See merge request gitlab-org/gitlab-ce!31001
-rw-r--r-- | app/models/application_setting.rb | 9 | ||||
-rw-r--r-- | app/models/note.rb | 2 | ||||
-rw-r--r-- | app/models/notification_setting.rb | 2 | ||||
-rw-r--r-- | app/models/user.rb | 6 | ||||
-rw-r--r-- | spec/services/ci/retry_build_service_spec.rb | 2 |
5 files changed, 1 insertions, 20 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 diff --git a/app/models/note.rb b/app/models/note.rb index 5bd3a7f969a..62b3f47fadd 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -33,8 +33,6 @@ class Note < ApplicationRecord end end - self.ignored_columns += %i[original_discussion_id] - cache_markdown_field :note, pipeline: :note, issuable_state_filter_enabled: true redact_field :note diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb index 637c017a342..bf2aec74ec8 100644 --- a/app/models/notification_setting.rb +++ b/app/models/notification_setting.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class NotificationSetting < ApplicationRecord - self.ignored_columns += %i[events] - enum level: { global: 3, watch: 2, participating: 1, mention: 4, disabled: 0, custom: 5 } default_value_for :level, NotificationSetting.levels[:global] diff --git a/app/models/user.rb b/app/models/user.rb index 5f109feb96a..9ca01715578 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -23,12 +23,6 @@ class User < ApplicationRecord DEFAULT_NOTIFICATION_LEVEL = :participating - self.ignored_columns += %i[ - authentication_token - email_provider - external_email - ] - add_authentication_token_field :incoming_email_token, token_generator: -> { SecureRandom.hex.to_i(16).to_s(36) } add_authentication_token_field :feed_token diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb index fe7c6fe4700..281c7438eee 100644 --- a/spec/services/ci/retry_build_service_spec.rb +++ b/spec/services/ci/retry_build_service_spec.rb @@ -40,7 +40,7 @@ describe Ci::RetryBuildService do user_id auto_canceled_by_id retried failure_reason sourced_pipelines artifacts_file_store artifacts_metadata_store metadata runner_session trace_chunks upstream_pipeline_id - artifacts_file artifacts_metadata artifacts_size].freeze + artifacts_file artifacts_metadata artifacts_size commands].freeze shared_examples 'build duplication' do let(:another_pipeline) { create(:ci_empty_pipeline, project: project) } |