diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-18 18:30:07 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-21 14:22:28 +0100 |
| commit | 1a5eedf3fedb09a3f6a7210ce435c95812c55013 (patch) | |
| tree | faac89dc9c337cc739ee05387ef5b9530a46baf0 /app/views | |
| parent | 53714ddf2bcc56659236d87647d8b8e8412592f3 (diff) | |
| download | gitlab-ce-1a5eedf3fedb09a3f6a7210ce435c95812c55013.tar.gz | |
Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-running
Also allow merge request to be merged with skipped pipeline and the
"only allow merge when pipeline is green" feature enabled
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_open.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml index 01314eb37d0..ac26aa569ba 100644 --- a/app/views/projects/merge_requests/widget/_open.html.haml +++ b/app/views/projects/merge_requests/widget/_open.html.haml @@ -23,7 +23,7 @@ = render 'projects/merge_requests/widget/open/merge_when_build_succeeds' - elsif !@merge_request.can_be_merged_by?(current_user) = render 'projects/merge_requests/widget/open/not_allowed' - - elsif !@merge_request.mergeable_ci_state? + - elsif !@merge_request.mergeable_ci_state? && (@pipeline.failed? || @pipeline.canceled?) = render 'projects/merge_requests/widget/open/build_failed' - elsif !@merge_request.mergeable_discussions_state? = render 'projects/merge_requests/widget/open/unresolved_discussions' |