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
70723899
Commit
70723899
authored
Mar 25, 2021
by
Dmytro Zaporozhets (DZ)
Committed by
Shinya Maeda
Mar 25, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove 1 year old ignore column
Signed-off-by:
Dmytro Zaporozhets
<
dzaporozhets@gitlab.com
>
parent
75891f66
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
0 additions
and
9 deletions
+0
-9
app/models/ci/build.rb
app/models/ci/build.rb
+0
-2
app/models/ci/runner.rb
app/models/ci/runner.rb
+0
-2
app/models/deploy_key.rb
app/models/deploy_key.rb
+0
-2
lib/gitlab/data_builder/build.rb
lib/gitlab/data_builder/build.rb
+0
-1
lib/gitlab/data_builder/pipeline.rb
lib/gitlab/data_builder/pipeline.rb
+0
-1
spec/lib/gitlab/data_builder/pipeline_spec.rb
spec/lib/gitlab/data_builder/pipeline_spec.rb
+0
-1
No files found.
app/models/ci/build.rb
View file @
70723899
...
@@ -14,8 +14,6 @@ module Ci
...
@@ -14,8 +14,6 @@ module Ci
BuildArchivedError
=
Class
.
new
(
StandardError
)
BuildArchivedError
=
Class
.
new
(
StandardError
)
ignore_columns
:artifacts_file
,
:artifacts_file_store
,
:artifacts_metadata
,
:artifacts_metadata_store
,
:artifacts_size
,
:commands
,
remove_after:
'2019-12-15'
,
remove_with:
'12.7'
belongs_to
:project
,
inverse_of: :builds
belongs_to
:project
,
inverse_of: :builds
belongs_to
:runner
belongs_to
:runner
belongs_to
:trigger_request
belongs_to
:trigger_request
...
...
app/models/ci/runner.rb
View file @
70723899
...
@@ -45,8 +45,6 @@ module Ci
...
@@ -45,8 +45,6 @@ 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
MINUTES_COST_FACTOR_FIELDS
=
%i[public_projects_minutes_cost_factor private_projects_minutes_cost_factor]
.
freeze
MINUTES_COST_FACTOR_FIELDS
=
%i[public_projects_minutes_cost_factor private_projects_minutes_cost_factor]
.
freeze
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
has_many
:projects
,
through: :runner_projects
has_many
:projects
,
through: :runner_projects
...
...
app/models/deploy_key.rb
View file @
70723899
...
@@ -13,8 +13,6 @@ class DeployKey < Key
...
@@ -13,8 +13,6 @@ 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: :route
]
})
}
scope
:with_projects
,
->
{
includes
(
deploy_keys_projects:
{
project:
[
:route
,
namespace: :route
]
})
}
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
def
private?
def
private?
...
...
lib/gitlab/data_builder/build.rb
View file @
70723899
...
@@ -85,7 +85,6 @@ module Gitlab
...
@@ -85,7 +85,6 @@ module Gitlab
id:
runner
.
id
,
id:
runner
.
id
,
description:
runner
.
description
,
description:
runner
.
description
,
active:
runner
.
active?
,
active:
runner
.
active?
,
is_shared:
runner
.
instance_type?
,
tags:
runner
.
tags
&
.
map
(
&
:name
)
tags:
runner
.
tags
&
.
map
(
&
:name
)
}
}
end
end
...
...
lib/gitlab/data_builder/pipeline.rb
View file @
70723899
...
@@ -77,7 +77,6 @@ module Gitlab
...
@@ -77,7 +77,6 @@ module Gitlab
id:
runner
.
id
,
id:
runner
.
id
,
description:
runner
.
description
,
description:
runner
.
description
,
active:
runner
.
active?
,
active:
runner
.
active?
,
is_shared:
runner
.
instance_type?
,
tags:
runner
.
tags
&
.
map
(
&
:name
)
tags:
runner
.
tags
&
.
map
(
&
:name
)
}
}
end
end
...
...
spec/lib/gitlab/data_builder/pipeline_spec.rb
View file @
70723899
...
@@ -59,7 +59,6 @@ RSpec.describe Gitlab::DataBuilder::Pipeline do
...
@@ -59,7 +59,6 @@ RSpec.describe Gitlab::DataBuilder::Pipeline do
expect
(
runner_data
[
:id
]).
to
eq
(
ci_runner
.
id
)
expect
(
runner_data
[
:id
]).
to
eq
(
ci_runner
.
id
)
expect
(
runner_data
[
:description
]).
to
eq
(
ci_runner
.
description
)
expect
(
runner_data
[
:description
]).
to
eq
(
ci_runner
.
description
)
expect
(
runner_data
[
:active
]).
to
eq
(
ci_runner
.
active
)
expect
(
runner_data
[
:active
]).
to
eq
(
ci_runner
.
active
)
expect
(
runner_data
[
:is_shared
]).
to
eq
(
ci_runner
.
instance_type?
)
expect
(
runner_data
[
:tags
]).
to
match_array
(
tag_names
)
expect
(
runner_data
[
:tags
]).
to
match_array
(
tag_names
)
end
end
end
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