summaryrefslogtreecommitdiff
path: root/app/views/shared
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-07 12:09:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-07 12:09:34 +0000
commit903ccf7c93eb9490c76857bffe744249cc07de09 (patch)
tree603a3162e91999160e4efc74f351f9405f422d61 /app/views/shared
parent41cb558299b483b44b45351730ee4c0e9fe4ca2c (diff)
downloadgitlab-ce-903ccf7c93eb9490c76857bffe744249cc07de09.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
-rw-r--r--app/views/shared/_merge_request_pipeline_status.html.haml3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/shared/_merge_request_pipeline_status.html.haml b/app/views/shared/_merge_request_pipeline_status.html.haml
new file mode 100644
index 00000000000..1c15b82367e
--- /dev/null
+++ b/app/views/shared/_merge_request_pipeline_status.html.haml
@@ -0,0 +1,3 @@
+- if can?(current_user, :read_pipeline, merge_request.head_pipeline)
+ %li.issuable-pipeline-status.d-none.d-sm-flex
+ = render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), option_css_classes: 'd-flex'