Commit 2ffcd8ef authored by Jacob Schatz's avatar Jacob Schatz
Browse files

adds exclamation point when assigned user cannot merge

parent e5d58d7ff399
...@@ -558,3 +558,8 @@ ...@@ -558,3 +558,8 @@
width: 101%; width: 101%;
} }
} }
.cannot-be-merged, .cannot-be-merged:hover {
color: #E62958;
margin-top: 2px;
}
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
.value .value
- if issuable.assignee - if issuable.assignee
%strong= link_to_member(@project, issuable.assignee, size: 24) %strong= link_to_member(@project, issuable.assignee, size: 24)
- if issuable.instance_of?(MergeRequest) && !@merge_request.can_be_merged_by?(issuable.assignee)
%a.pull-right.cannot-be-merged{href:'#', data:{toggle:'tooltip'}, title:'Not allowed to merge'}
= icon('exclamation-triangle')
- else - else
.light None .light None
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment