summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/_show.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/merge_requests/_show.html.haml')
-rw-r--r--app/views/projects/merge_requests/_show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index b9695157f68..ee5b9fd95a8 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -34,7 +34,7 @@
%span into
= link_to namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" do
= @merge_request.target_branch
- - if @merge_request.mergeable? && @merge_request.diverged_from_target_branch?
+ - if @merge_request.open? && @merge_request.diverged_from_target_branch?
%span (#{pluralize(@merge_request.diverged_commits_count, 'commit')} behind)
= render "projects/merge_requests/show/how_to_merge"