diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-09 16:08:38 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-10 14:37:32 +0200 |
| commit | 5324c9364346f74ea73c6be27785704e8e2281f8 (patch) | |
| tree | 880b7c61a53dfe8d9ffc5887c68f5e8fb6f59a31 /app/views | |
| parent | 282674c1108bdd761f4027910a32396fe253bc95 (diff) | |
| download | gitlab-ce-5324c9364346f74ea73c6be27785704e8e2281f8.tar.gz | |
Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergeable_ci_state?
The logic of the method was obviously inverted.
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 9ea4df4357f..84fbf618ec6 100644 --- a/app/views/projects/merge_requests/widget/_open.html.haml +++ b/app/views/projects/merge_requests/widget/_open.html.haml @@ -17,7 +17,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.cannot_be_merged_because_build_is_not_success? && @ci_commit && @ci_commit.failed? + - elsif !@merge_request.mergeable_ci_state? && @ci_commit && @ci_commit.failed? = render 'projects/merge_requests/widget/open/build_failed' - elsif @merge_request.can_be_merged? = render 'projects/merge_requests/widget/open/accept' |