diff options
Diffstat (limited to 'app/views/projects/merge_requests/widget/open/_conflicts.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml index 9e0c8a9e06f..d1db5fec43a 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -1,4 +1,4 @@ -- if @allowed_to_merge +- if @merge_request.can_be_merged_by?(current_user) %h4 This merge request contains merge conflicts that must be resolved. You can try it manually on the |