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
94f7724f
Commit
94f7724f
authored
Nov 18, 2019
by
Andreas Brandl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Singular ignore_column method
parent
262a9c56
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
4 deletions
+6
-4
app/models/ci/runner.rb
app/models/ci/runner.rb
+1
-1
app/models/concerns/ignorable_columns.rb
app/models/concerns/ignorable_columns.rb
+2
-0
app/models/deploy_key.rb
app/models/deploy_key.rb
+1
-1
app/models/project.rb
app/models/project.rb
+1
-1
ee/app/models/operations/feature_flags_client.rb
ee/app/models/operations/feature_flags_client.rb
+1
-1
No files found.
app/models/ci/runner.rb
View file @
94f7724f
...
@@ -36,7 +36,7 @@ module Ci
...
@@ -36,7 +36,7 @@ module Ci
FORM_EDITABLE
=
%i[description tag_list active run_untagged locked access_level maximum_timeout_human_readable]
.
freeze
FORM_EDITABLE
=
%i[description tag_list active run_untagged locked access_level maximum_timeout_human_readable]
.
freeze
ignore_column
s
:is_shared
,
remove_after:
'2019-12-15'
,
remove_with:
'12.6'
ignore_column
:is_shared
,
remove_after:
'2019-12-15'
,
remove_with:
'12.6'
has_many
:builds
has_many
:builds
has_many
:runner_projects
,
inverse_of: :runner
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_many
:runner_projects
,
inverse_of: :runner
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
...
...
app/models/concerns/ignorable_columns.rb
View file @
94f7724f
...
@@ -12,5 +12,7 @@ module IgnorableColumns
...
@@ -12,5 +12,7 @@ module IgnorableColumns
self
.
ignored_columns
+=
columns
self
.
ignored_columns
+=
columns
end
end
alias_method
:ignore_column
,
:ignore_columns
end
end
end
end
app/models/deploy_key.rb
View file @
94f7724f
...
@@ -11,7 +11,7 @@ class DeployKey < Key
...
@@ -11,7 +11,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
]
})
}
ignore_column
s
:can_push
,
remove_after:
'2019-12-15'
,
remove_with:
'12.6'
ignore_column
:can_push
,
remove_after:
'2019-12-15'
,
remove_with:
'12.6'
accepts_nested_attributes_for
:deploy_keys_projects
accepts_nested_attributes_for
:deploy_keys_projects
...
...
app/models/project.rb
View file @
94f7724f
...
@@ -65,7 +65,7 @@ class Project < ApplicationRecord
...
@@ -65,7 +65,7 @@ class Project < ApplicationRecord
# TODO: remove once GitLab 12.5 is released
# TODO: remove once GitLab 12.5 is released
# https://gitlab.com/gitlab-org/gitlab/issues/34638
# https://gitlab.com/gitlab-org/gitlab/issues/34638
ignore_column
s
:merge_requests_require_code_owner_approval
,
remove_after:
'2019-12-01'
,
remove_with:
'12.6'
ignore_column
:merge_requests_require_code_owner_approval
,
remove_after:
'2019-12-01'
,
remove_with:
'12.6'
default_value_for
:archived
,
false
default_value_for
:archived
,
false
default_value_for
:resolve_outdated_diff_discussions
,
false
default_value_for
:resolve_outdated_diff_discussions
,
false
...
...
ee/app/models/operations/feature_flags_client.rb
View file @
94f7724f
...
@@ -6,7 +6,7 @@ module Operations
...
@@ -6,7 +6,7 @@ module Operations
include
IgnorableColumns
include
IgnorableColumns
self
.
table_name
=
'operations_feature_flags_clients'
self
.
table_name
=
'operations_feature_flags_clients'
ignore_column
s
:token
,
remove_after:
'2019-12-15'
,
remove_with:
'12.6'
ignore_column
:token
,
remove_after:
'2019-12-15'
,
remove_with:
'12.6'
belongs_to
:project
belongs_to
: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