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
Boxiang Sun
gitlab-ce
Commits
152c2b5b
Commit
152c2b5b
authored
Mar 07, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new merge request widget state for blocked pipeline
parent
db2617fd
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
1 deletion
+9
-1
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+2
-0
app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml
+1
-1
app/views/projects/merge_requests/widget/_open.html.haml
app/views/projects/merge_requests/widget/_open.html.haml
+2
-0
app/views/projects/merge_requests/widget/open/_manual.html.haml
...ews/projects/merge_requests/widget/open/_manual.html.haml
+4
-0
No files found.
app/helpers/ci_status_helper.rb
View file @
152c2b5b
...
@@ -48,6 +48,8 @@ module CiStatusHelper
...
@@ -48,6 +48,8 @@ module CiStatusHelper
'icon_status_created'
'icon_status_created'
when
'skipped'
when
'skipped'
'icon_status_skipped'
'icon_status_skipped'
when
'manual'
'icon_status_manual'
else
else
'icon_status_canceled'
'icon_status_canceled'
end
end
...
...
app/views/projects/merge_requests/widget/_heading.html.haml
View file @
152c2b5b
-
if
@pipeline
-
if
@pipeline
.mr-widget-heading
.mr-widget-heading
-
%w[success success_with_warnings skipped canceled failed running pending]
.
each
do
|
status
|
-
%w[success success_with_warnings skipped
manual
canceled failed running pending]
.
each
do
|
status
|
.ci_widget
{
class:
"ci-#{status}"
,
style:
(
"display:none"
unless
@pipeline
.
status
==
status
)
}
.ci_widget
{
class:
"ci-#{status}"
,
style:
(
"display:none"
unless
@pipeline
.
status
==
status
)
}
%div
{
class:
"ci-status-icon ci-status-icon-#{status}"
}
%div
{
class:
"ci-status-icon ci-status-icon-#{status}"
}
=
link_to
namespace_project_pipeline_path
(
@pipeline
.
project
.
namespace
,
@pipeline
.
project
,
@pipeline
.
id
),
class:
'icon-link'
do
=
link_to
namespace_project_pipeline_path
(
@pipeline
.
project
.
namespace
,
@pipeline
.
project
,
@pipeline
.
id
),
class:
'icon-link'
do
...
...
app/views/projects/merge_requests/widget/_open.html.haml
View file @
152c2b5b
...
@@ -27,6 +27,8 @@
...
@@ -27,6 +27,8 @@
=
render
'projects/merge_requests/widget/open/build_failed'
=
render
'projects/merge_requests/widget/open/build_failed'
-
elsif
!
@merge_request
.
mergeable_discussions_state?
-
elsif
!
@merge_request
.
mergeable_discussions_state?
=
render
'projects/merge_requests/widget/open/unresolved_discussions'
=
render
'projects/merge_requests/widget/open/unresolved_discussions'
-
elsif
@pipeline
&
.
blocked?
=
render
'projects/merge_requests/widget/open/manual'
-
elsif
@merge_request
.
can_be_merged?
||
resolved_conflicts
-
elsif
@merge_request
.
can_be_merged?
||
resolved_conflicts
=
render
'projects/merge_requests/widget/open/accept'
=
render
'projects/merge_requests/widget/open/accept'
...
...
app/views/projects/merge_requests/widget/open/_manual.html.haml
0 → 100644
View file @
152c2b5b
%h4
Pipeline blocked
%p
The pipeline for this merge request requires a manual action to proceed.
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