From 592dce18b549cd29933603f53f1ab8fb9f33840e Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Thu, 27 Mar 2014 14:32:32 +0100 Subject: [PATCH] Always show merge status --- app/views/projects/merge_requests/show/_mr_accept.html.haml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 4b1857c..bd7c843 100644 --- 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 -- libgit2 0.21.2