kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove ignore_column occurence in CE code

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2019-07-19 18:00:51 +03:00 committed by Peter Leitzen
parent 7e8453fe92
commit 00e19736f9
No known key found for this signature in database
GPG key ID: 97DE9D2E708A225E
5 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/application_setting.rb
View file

@ -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

2
app/models/note.rb
View file

@ -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

2
app/models/notification_setting.rb
View file

@ -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]

6
app/models/user.rb
View file

@ -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

2
spec/services/ci/retry_build_service_spec.rb
View file

@ -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) }