diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-24 17:11:36 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-24 17:11:36 +0300 |
| commit | 56ab571fd3b4c589e040b40cf9bd81044b5d8ee3 (patch) | |
| tree | 2d106526d9a80ef446198a33b2265b74e53d50d6 /app/views/projects/merge_requests/widget/_open.html.haml | |
| parent | f7723b8ebdc437feb731275d9a3cc109a6ce1761 (diff) | |
| parent | c768026474b9dff9f6f988372e4eefb85b1d8be9 (diff) | |
Merge branch 'master' into 20827-getting-started-update-new-group-view20827-getting-started-update-new-group-view
Diffstat (limited to 'app/views/projects/merge_requests/widget/_open.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_open.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml index bc426f1dc0c..0872a1a0503 100644 --- a/app/views/projects/merge_requests/widget/_open.html.haml +++ b/app/views/projects/merge_requests/widget/_open.html.haml @@ -19,6 +19,8 @@ = render 'projects/merge_requests/widget/open/conflicts' - elsif @merge_request.work_in_progress? = render 'projects/merge_requests/widget/open/wip' + - elsif @merge_request.merge_when_pipeline_succeeds? && @merge_request.merge_error.present? + = render 'projects/merge_requests/widget/open/error' - elsif @merge_request.merge_when_pipeline_succeeds? = render 'projects/merge_requests/widget/open/merge_when_pipeline_succeeds' - elsif !@merge_request.can_be_merged_by?(current_user) |