summaryrefslogtreecommitdiff
path: root/app/views/merge_requests/show.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/merge_requests/show.html.haml')
-rw-r--r--app/views/merge_requests/show.html.haml5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml
index aef74b8dce6..1b23e5b225f 100644
--- a/app/views/merge_requests/show.html.haml
+++ b/app/views/merge_requests/show.html.haml
@@ -71,6 +71,11 @@
.alert-message
%p
%strong Checking for ability to automatically mergeā€¦
+
+ .automerge_widget.already_cannot_be_merged{:style => "display:none"}
+ .alert-message
+ %p
+ %strong This merge request already can not be merged