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
09e08e54
Commit
09e08e54
authored
Jul 06, 2020
by
lauraMon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes FF and condition
parent
96edc891
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
10 deletions
+0
-10
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+0
-2
app/services/ci/retry_build_service.rb
app/services/ci/retry_build_service.rb
+0
-4
lib/gitlab/ci/features.rb
lib/gitlab/ci/features.rb
+0
-4
No files found.
app/models/ci/pipeline.rb
View file @
09e08e54
...
@@ -1004,8 +1004,6 @@ module Ci
...
@@ -1004,8 +1004,6 @@ module Ci
# Set scheduling type of processables if they were created before scheduling_type
# Set scheduling type of processables if they were created before scheduling_type
# data was deployed (https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22246).
# data was deployed (https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22246).
def
ensure_scheduling_type!
def
ensure_scheduling_type!
return
unless
::
Gitlab
::
Ci
::
Features
.
ensure_scheduling_type_enabled?
processables
.
populate_scheduling_type!
processables
.
populate_scheduling_type!
end
end
...
...
app/services/ci/retry_build_service.rb
View file @
09e08e54
...
@@ -34,10 +34,6 @@ module Ci
...
@@ -34,10 +34,6 @@ module Ci
attributes
[
:user
]
=
current_user
attributes
[
:user
]
=
current_user
# TODO: we can probably remove this logic
# see: https://gitlab.com/gitlab-org/gitlab/-/issues/217930
attributes
[
:scheduling_type
]
||=
build
.
find_legacy_scheduling_type
Ci
::
Build
.
transaction
do
Ci
::
Build
.
transaction
do
# mark all other builds of that name as retried
# mark all other builds of that name as retried
build
.
pipeline
.
builds
.
latest
build
.
pipeline
.
builds
.
latest
...
...
lib/gitlab/ci/features.rb
View file @
09e08e54
...
@@ -10,10 +10,6 @@ module Gitlab
...
@@ -10,10 +10,6 @@ module Gitlab
::
Feature
.
enabled?
(
:ci_artifacts_exclude
,
default_enabled:
true
)
::
Feature
.
enabled?
(
:ci_artifacts_exclude
,
default_enabled:
true
)
end
end
def
self
.
ensure_scheduling_type_enabled?
::
Feature
.
enabled?
(
:ci_ensure_scheduling_type
,
default_enabled:
true
)
end
def
self
.
job_heartbeats_runner?
(
project
)
def
self
.
job_heartbeats_runner?
(
project
)
::
Feature
.
enabled?
(
:ci_job_heartbeats_runner
,
project
,
default_enabled:
true
)
::
Feature
.
enabled?
(
:ci_job_heartbeats_runner
,
project
,
default_enabled:
true
)
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