Fix spacing issues, fix naming inconsistencies. Fix conflicts.

app/assets/stylesheets/pages/projects.scss

@@ -560,6 +560,6 @@ pre.light-well {
 }
 
 .cannot-be-merged, .cannot-be-merged:hover {
-  color: $error-exclamation-point;
+  color: #E62958;
   margin-top: 2px;
-}
\ No newline at end of file
+}

app/views/shared/issuable/_sidebar.html.haml

@@ -10,8 +10,8 @@
       .value
         - if issuable.assignee
           %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'}
+          - 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'}
               = icon('exclamation-triangle')
         - else
           .light None