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
5bf855cb
Commit
5bf855cb
authored
Jul 19, 2019
by
Dmitriy Zaporozhets
Committed by
Peter Leitzen
Sep 10, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ignore_column occurence in CE code
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
4f555fff
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
20 deletions
+1
-20
app/models/application_setting.rb
app/models/application_setting.rb
+0
-9
app/models/note.rb
app/models/note.rb
+0
-2
app/models/notification_setting.rb
app/models/notification_setting.rb
+0
-2
app/models/user.rb
app/models/user.rb
+0
-6
spec/services/ci/retry_build_service_spec.rb
spec/services/ci/retry_build_service_spec.rb
+1
-1
No files found.
app/models/application_setting.rb
View file @
5bf855cb
...
@@ -31,15 +31,6 @@ class ApplicationSetting < ApplicationRecord
...
@@ -31,15 +31,6 @@ class ApplicationSetting < ApplicationRecord
serialize
:repository_storages
# rubocop:disable Cop/ActiveRecordSerialize
serialize
:repository_storages
# rubocop:disable Cop/ActiveRecordSerialize
serialize
:asset_proxy_whitelist
,
Array
# 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
:sign_in_text
cache_markdown_field
:help_page_text
cache_markdown_field
:help_page_text
cache_markdown_field
:shared_runners_text
,
pipeline: :plain_markdown
cache_markdown_field
:shared_runners_text
,
pipeline: :plain_markdown
...
...
app/models/note.rb
View file @
5bf855cb
...
@@ -33,8 +33,6 @@ class Note < ApplicationRecord
...
@@ -33,8 +33,6 @@ class Note < ApplicationRecord
end
end
end
end
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
redact_field
:note
redact_field
:note
...
...
app/models/notification_setting.rb
View file @
5bf855cb
# frozen_string_literal: true
# frozen_string_literal: true
class
NotificationSetting
<
ApplicationRecord
class
NotificationSetting
<
ApplicationRecord
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
}
default_value_for
:level
,
NotificationSetting
.
levels
[
:global
]
default_value_for
:level
,
NotificationSetting
.
levels
[
:global
]
...
...
app/models/user.rb
View file @
5bf855cb
...
@@ -23,12 +23,6 @@ class User < ApplicationRecord
...
@@ -23,12 +23,6 @@ class User < ApplicationRecord
DEFAULT_NOTIFICATION_LEVEL
=
:participating
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
: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
...
...
spec/services/ci/retry_build_service_spec.rb
View file @
5bf855cb
...
@@ -40,7 +40,7 @@ describe Ci::RetryBuildService do
...
@@ -40,7 +40,7 @@ describe Ci::RetryBuildService do
user_id auto_canceled_by_id retried failure_reason
user_id auto_canceled_by_id retried failure_reason
sourced_pipelines artifacts_file_store artifacts_metadata_store
sourced_pipelines artifacts_file_store artifacts_metadata_store
metadata runner_session trace_chunks upstream_pipeline_id
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
shared_examples
'build duplication'
do
let
(
:another_pipeline
)
{
create
(
:ci_empty_pipeline
,
project:
project
)
}
let
(
:another_pipeline
)
{
create
(
:ci_empty_pipeline
,
project:
project
)
}
...
...
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