Always show merge status

Always show the merge status of a merge request, even if the user has no permission to do the actual merging. Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/5673321-everyone-should-be-able-to-see-a-mr-status

Always show merge status
592dce18 · Jeroen van Baarsen · 0f055197 · 592dce18
Commit 592dce18 authored Mar 27, 2014 by Jeroen van Baarsen
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

_mr_accept.html.haml app/views/projects/merge_requests/show/_mr_accept.html.haml +4 -1

No files found.
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -4,7 +4,10 @@
      %strong Archived projects cannot be committed to!
  - else
    .bs-callout
-      %strong You don't have permission to merge this MR
+      .automerge_widget.cannot_be_merged.hide
+        %strong This can't be merged automatically, even if it could be merged you don't have the permission to do so.
+      .automerge_widget.can_be_merged.hide
+        %strong This can be merged automatically but you don't have the permission to do so.


 - if @show_merge_controls