diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-20 10:45:40 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-20 10:45:40 +0000 |
| commit | f96e1bf12432b0f4eff4a900caa46a0c4790123f (patch) | |
| tree | 6d0428ed0a51f82b0d62323a0f36c612d7ae4a0f /app/views/projects | |
| parent | b99853f509cca1c6ae1892513658add575230692 (diff) | |
| parent | e4543f1a551dab352dfe91a09e596ed96a49f5f1 (diff) | |
| download | gitlab-ce-f96e1bf12432b0f4eff4a900caa46a0c4790123f.tar.gz | |
Merge branch 'fix/29125' into 'master'
Port of fix/29125-ee to CE
Closes #29125
See merge request !10796
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_open.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_error.html.haml | 6 |
2 files changed, 8 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) diff --git a/app/views/projects/merge_requests/widget/open/_error.html.haml b/app/views/projects/merge_requests/widget/open/_error.html.haml new file mode 100644 index 00000000000..bbdc053609f --- /dev/null +++ b/app/views/projects/merge_requests/widget/open/_error.html.haml @@ -0,0 +1,6 @@ +%h4 + = icon('exclamation-triangle') + This merge request failed to be merged automatically + +%p + = @merge_request.merge_error |