root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Use self.ignored_columns += instead of = 

This is to accomodate prepended modules.
This commit is contained in:
Stan Hu 2019-08-29 16:10:49 -07:00
parent fa6f19d1f8
commit d93b985df0
7 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/application_setting.rb
View File

@ -24,14 +24,14 @@ class ApplicationSetting < ApplicationRecord
serialize :domain_blacklist, Array # rubocop:disable Cop/ActiveRecordSerialize serialize :domain_blacklist, Array # rubocop:disable Cop/ActiveRecordSerialize
serialize :repository_storages # rubocop:disable Cop/ActiveRecordSerialize serialize :repository_storages # rubocop:disable Cop/ActiveRecordSerialize
self.ignored_columns = %i[ self.ignored_columns += %i[
clientside_sentry_dsn clientside_sentry_dsn
clientside_sentry_enabled clientside_sentry_enabled
koding_enabled koding_enabled
koding_url koding_url
sentry_dsn sentry_dsn
sentry_enabled sentry_enabled
] ]
cache_markdown_field :sign_in_text cache_markdown_field :sign_in_text
cache_markdown_field :help_page_text cache_markdown_field :help_page_text

16
app/models/ci/build.rb
View File

@ -17,14 +17,14 @@ module Ci
BuildArchivedError = Class.new(StandardError) BuildArchivedError = Class.new(StandardError)
self.ignored_columns = %i[ self.ignored_columns += %i[
artifacts_file artifacts_file
artifacts_file_store artifacts_file_store
artifacts_metadata artifacts_metadata
artifacts_metadata_store artifacts_metadata_store
artifacts_size artifacts_size
commands commands
] ]
belongs_to :project, inverse_of: :builds belongs_to :project, inverse_of: :builds
belongs_to :runner belongs_to :runner

2
app/models/deploy_key.rb
View File

@ -10,7 +10,7 @@ class DeployKey < Key
scope :are_public, -> { where(public: true) } scope :are_public, -> { where(public: true) }
scope :with_projects, -> { includes(deploy_keys_projects: { project: [:route, :namespace] }) } scope :with_projects, -> { includes(deploy_keys_projects: { project: [:route, :namespace] }) }
self.ignored_columns = %i[can_push] self.ignored_columns += %i[can_push]
accepts_nested_attributes_for :deploy_keys_projects accepts_nested_attributes_for :deploy_keys_projects

2
app/models/note.rb
View File

@ -33,7 +33,7 @@ class Note < ApplicationRecord
end end
end end
self.ignored_columns = %i[original_discussion_id] self.ignored_columns += %i[original_discussion_id]
cache_markdown_field :note, pipeline: :note, issuable_state_filter_enabled: true cache_markdown_field :note, pipeline: :note, issuable_state_filter_enabled: true

3
app/models/notification_setting.rb
View File

@ -1,8 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class NotificationSetting < ApplicationRecord class NotificationSetting < ApplicationRecord
self.ignored_columns += %i[events]
self.ignored_columns = %i[events]
enum level: { global: 3, watch: 2, participating: 1, mention: 4, disabled: 0, custom: 5 } enum level: { global: 3, watch: 2, participating: 1, mention: 4, disabled: 0, custom: 5 }

10
app/models/user.rb
View File

@ -23,11 +23,11 @@ class User < ApplicationRecord
DEFAULT_NOTIFICATION_LEVEL = :participating DEFAULT_NOTIFICATION_LEVEL = :participating
self.ignored_columns = %i[ self.ignored_columns += %i[
authentication_token authentication_token
email_provider email_provider
external_email external_email
] ]
add_authentication_token_field :incoming_email_token, token_generator: -> { SecureRandom.hex.to_i(16).to_s(36) } add_authentication_token_field :incoming_email_token, token_generator: -> { SecureRandom.hex.to_i(16).to_s(36) }
add_authentication_token_field :feed_token add_authentication_token_field :feed_token

2
doc/development/what_requires_downtime.md
View File

@ -50,7 +50,7 @@ places. This can be done by defining the columns to ignore. For example, to igno
```ruby ```ruby
class User < ApplicationRecord class User < ApplicationRecord
self.ignored_columns = %i[updated_at] self.ignored_columns += %i[updated_at]
end end
``` ```