Commit fbb27a42 authored by Jacob Schatz's avatar Jacob Schatz

Fix spacing issues, fix naming inconsistencies. Fix conflicts.

Used `issuable` instead
parent 8b3d6793
...@@ -560,6 +560,6 @@ pre.light-well { ...@@ -560,6 +560,6 @@ pre.light-well {
} }
.cannot-be-merged, .cannot-be-merged:hover { .cannot-be-merged, .cannot-be-merged:hover {
color: $error-exclamation-point; color: #E62958;
margin-top: 2px; margin-top: 2px;
} }
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
.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) - if issuable.instance_of?(MergeRequest) && !issuable.can_be_merged_by?(issuable.assignee)
%a.pull-right.cannot-be-merged{href:'#', data:{toggle:'tooltip'}, title:'Not allowed to merge'} %a.pull-right.cannot-be-merged{href: '#', data: {toggle: 'tooltip'}, title: 'Not allowed to merge'}
= icon('exclamation-triangle') = icon('exclamation-triangle')
- else - else
.light None .light None
......
Markdown is supported
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