diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-04-19 17:12:48 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-04-19 17:14:50 -0300 |
| commit | d8d448c2854ecf3908705fdb1804a758e00c42cb (patch) | |
| tree | 9989946b366807671b9602f0088e39b60d94893a /app/views/projects/merge_requests | |
| parent | 93e23a5d718eafb78c4b8d5b605d740d48c75418 (diff) | |
| download | gitlab-ce-d8d448c2854ecf3908705fdb1804a758e00c42cb.tar.gz | |
Port of fix/29125-ee to CE
Diffstat (limited to 'app/views/projects/merge_requests')
| -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 |