Commit 2ca4e70894229d9a7920f7539b9390bc43159b73
1 parent
9b7b27ce
Exists in
master
and in
4 other branches
Show MR accept info only if merge request is open
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
5 additions
and
4 deletions
Show diff stats
app/views/projects/merge_requests/_show.html.haml
| @@ -2,10 +2,11 @@ | @@ -2,10 +2,11 @@ | ||
| 2 | = render "projects/merge_requests/show/mr_title" | 2 | = render "projects/merge_requests/show/mr_title" |
| 3 | = render "projects/merge_requests/show/how_to_merge" | 3 | = render "projects/merge_requests/show/how_to_merge" |
| 4 | = render "projects/merge_requests/show/mr_box" | 4 | = render "projects/merge_requests/show/mr_box" |
| 5 | - - if @merge_request.source_branch_exists? && @merge_request.target_branch_exists? | ||
| 6 | - = render "projects/merge_requests/show/mr_accept" | ||
| 7 | - - else | ||
| 8 | - = render "projects/merge_requests/show/no_accept" | 5 | + - if @merge_request.opened? |
| 6 | + - if @merge_request.source_branch_exists? && @merge_request.target_branch_exists? | ||
| 7 | + = render "projects/merge_requests/show/mr_accept" | ||
| 8 | + - else | ||
| 9 | + = render "projects/merge_requests/show/no_accept" | ||
| 9 | - if @merge_request.source_project.gitlab_ci? | 10 | - if @merge_request.source_project.gitlab_ci? |
| 10 | = render "projects/merge_requests/show/mr_ci" | 11 | = render "projects/merge_requests/show/mr_ci" |
| 11 | = render "projects/merge_requests/show/commits" | 12 | = render "projects/merge_requests/show/commits" |