summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-01-08 21:50:36 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-01-08 21:50:36 +0000
commitd403d7ac6cc21d27ebdedaa90671d89c4b86bb5f (patch)
tree284f5ef7c773070485fe8c1d077900f4fe8157e7 /app/views
parent1b3affafab0f28c690ce93cc98ac6bd09cbda59f (diff)
downloadgitlab-ce-d403d7ac6cc21d27ebdedaa90671d89c4b86bb5f.tar.gz
Fix MR sidebar to correctly warning if assignee can't merge
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/issuable/_sidebar_assignees.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml
index c5cce1823f0..1a59055f652 100644
--- a/app/views/shared/issuable/_sidebar_assignees.html.haml
+++ b/app/views/shared/issuable/_sidebar_assignees.html.haml
@@ -25,7 +25,7 @@
.value.hide-collapsed
- if issuable_sidebar[:assignee]
= link_to_member(@project, assignee, size: 32, extra_class: 'bold') do
- - if issuable_sidebar[:assignee][:can_merge]
+ - unless issuable_sidebar[:assignee][:can_merge]
%span.float-right.cannot-be-merged{ data: { toggle: 'tooltip', placement: 'left' }, title: _('Not allowed to merge') }
= icon('exclamation-triangle', 'aria-hidden': 'true')
%span.username