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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d56c3782
Commit
d56c3782
authored
Aug 30, 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
0832c91f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
18 deletions
+18
-18
app/models/application_setting.rb
app/models/application_setting.rb
+7
-7
app/models/ci/build.rb
app/models/ci/build.rb
+7
-7
app/models/user.rb
app/models/user.rb
+4
-4
No files found.
app/models/application_setting.rb
View file @
d56c3782
...
...
@@ -32,13 +32,13 @@ class ApplicationSetting < ApplicationRecord
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
]
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 @
d56c3782
...
...
@@ -18,13 +18,13 @@ module Ci
BuildArchivedError
=
Class
.
new
(
StandardError
)
self
.
ignored_columns
+=
%i[
artifacts_file
artifacts_file_store
artifacts_metadata
artifacts_metadata_store
artifacts_size
commands
]
artifacts_file
artifacts_file_store
artifacts_metadata
artifacts_metadata_store
artifacts_size
commands
]
belongs_to
:project
,
inverse_of: :builds
belongs_to
:runner
...
...
app/models/user.rb
View file @
d56c3782
...
...
@@ -24,10 +24,10 @@ class User < ApplicationRecord
DEFAULT_NOTIFICATION_LEVEL
=
:participating
self
.
ignored_columns
+=
%i[
authentication_token
email_provider
external_email
]
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
...
...
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