Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
d93b985d
Commit
d93b985d
authored
Aug 29, 2019
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use self.ignored_columns += instead of =
This is to accomodate prepended modules.
parent
fa6f19d1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
26 deletions
+25
-26
app/models/application_setting.rb
app/models/application_setting.rb
+8
-8
app/models/ci/build.rb
app/models/ci/build.rb
+8
-8
app/models/deploy_key.rb
app/models/deploy_key.rb
+1
-1
app/models/note.rb
app/models/note.rb
+1
-1
app/models/notification_setting.rb
app/models/notification_setting.rb
+1
-2
app/models/user.rb
app/models/user.rb
+5
-5
doc/development/what_requires_downtime.md
doc/development/what_requires_downtime.md
+1
-1
No files found.
app/models/application_setting.rb
View file @
d93b985d
...
...
@@ -24,14 +24,14 @@ class ApplicationSetting < ApplicationRecord
serialize
:domain_blacklist
,
Array
# rubocop:disable Cop/ActiveRecordSerialize
serialize
:repository_storages
# rubocop:disable Cop/ActiveRecordSerialize
self
.
ignored_columns
=
%i[
clientside_sentry_dsn
clientside_sentry_enabled
koding_enabled
koding_url
sentry_dsn
sentry_enabled
]
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
...
...
app/models/ci/build.rb
View file @
d93b985d
...
...
@@ -17,14 +17,14 @@ module Ci
BuildArchivedError
=
Class
.
new
(
StandardError
)
self
.
ignored_columns
=
%i[
artifacts_file
artifacts_file_store
artifacts_metadata
artifacts_metadata_store
artifacts_size
commands
]
self
.
ignored_columns
+
=
%i[
artifacts_file
artifacts_file_store
artifacts_metadata
artifacts_metadata_store
artifacts_size
commands
]
belongs_to
:project
,
inverse_of: :builds
belongs_to
:runner
...
...
app/models/deploy_key.rb
View file @
d93b985d
...
...
@@ -10,7 +10,7 @@ class DeployKey < Key
scope
:are_public
,
->
{
where
(
public:
true
)
}
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
...
...
app/models/note.rb
View file @
d93b985d
...
...
@@ -33,7 +33,7 @@ class Note < ApplicationRecord
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
...
...
app/models/notification_setting.rb
View file @
d93b985d
# frozen_string_literal: true
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
}
...
...
app/models/user.rb
View file @
d93b985d
...
...
@@ -23,11 +23,11 @@ class User < ApplicationRecord
DEFAULT_NOTIFICATION_LEVEL
=
:participating
self
.
ignored_columns
=
%i[
authentication_token
email_provider
external_email
]
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
...
...
doc/development/what_requires_downtime.md
View file @
d93b985d
...
...
@@ -50,7 +50,7 @@ places. This can be done by defining the columns to ignore. For example, to igno
```
ruby
class
User
<
ApplicationRecord
self
.
ignored_columns
=
%i[updated_at]
self
.
ignored_columns
+
=
%i[updated_at]
end
```
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment