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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
ddb313ae
Commit
ddb313ae
authored
Sep 27, 2018
by
Shinya Maeda
Committed by
Alessio Caiazza
Oct 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Scheduled Status class from pipeline
parent
6d712148
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
24 deletions
+2
-24
app/services/ci/process_pipeline_service.rb
app/services/ci/process_pipeline_service.rb
+1
-1
lib/gitlab/ci/status/pipeline/blocked.rb
lib/gitlab/ci/status/pipeline/blocked.rb
+1
-1
lib/gitlab/ci/status/pipeline/factory.rb
lib/gitlab/ci/status/pipeline/factory.rb
+0
-1
lib/gitlab/ci/status/pipeline/scheduled.rb
lib/gitlab/ci/status/pipeline/scheduled.rb
+0
-21
No files found.
app/services/ci/process_pipeline_service.rb
View file @
ddb313ae
...
@@ -24,7 +24,7 @@ module Ci
...
@@ -24,7 +24,7 @@ module Ci
def
process_stage
(
index
)
def
process_stage
(
index
)
current_status
=
status_for_prior_stages
(
index
)
current_status
=
status_for_prior_stages
(
index
)
return
if
HasStatus
::
BLOCKED_STATUS
==
current_status
return
if
HasStatus
::
BLOCKED_STATUS
.
include?
(
current_status
)
if
HasStatus
::
COMPLETED_STATUSES
.
include?
(
current_status
)
if
HasStatus
::
COMPLETED_STATUSES
.
include?
(
current_status
)
created_builds_in_stage
(
index
).
select
do
|
build
|
created_builds_in_stage
(
index
).
select
do
|
build
|
...
...
lib/gitlab/ci/status/pipeline/blocked.rb
View file @
ddb313ae
...
@@ -8,7 +8,7 @@ module Gitlab
...
@@ -8,7 +8,7 @@ module Gitlab
end
end
def
label
def
label
s_
(
'CiStatusLabel|waiting for manual action'
)
s_
(
'CiStatusLabel|waiting for manual action
or delayed job
'
)
end
end
def
self
.
matches?
(
pipeline
,
user
)
def
self
.
matches?
(
pipeline
,
user
)
...
...
lib/gitlab/ci/status/pipeline/factory.rb
View file @
ddb313ae
...
@@ -5,7 +5,6 @@ module Gitlab
...
@@ -5,7 +5,6 @@ module Gitlab
class
Factory
<
Status
::
Factory
class
Factory
<
Status
::
Factory
def
self
.
extended_statuses
def
self
.
extended_statuses
[[
Status
::
SuccessWarning
,
[[
Status
::
SuccessWarning
,
Status
::
Pipeline
::
Scheduled
,
Status
::
Pipeline
::
Blocked
]]
Status
::
Pipeline
::
Blocked
]]
end
end
...
...
lib/gitlab/ci/status/pipeline/scheduled.rb
deleted
100644 → 0
View file @
6d712148
module
Gitlab
module
Ci
module
Status
module
Pipeline
class
Scheduled
<
Status
::
Extended
def
text
s_
(
'CiStatusText|scheduled'
)
end
def
label
s_
(
'CiStatusLabel|waiting for scheduled job'
)
end
def
self
.
matches?
(
pipeline
,
user
)
pipeline
.
scheduled?
end
end
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