diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-13 13:21:12 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-13 13:21:12 +0200 |
| commit | 2ca4e70894229d9a7920f7539b9390bc43159b73 (patch) | |
| tree | 6de584486b8a7b8c9265721d8891877965c34308 | |
| parent | 9b7b27ce7216652493648228f2352d1d08836549 (diff) | |
| download | gitlab-ce-2ca4e70894229d9a7920f7539b9390bc43159b73.tar.gz | |
Show MR accept info only if merge request is openv6.4.0.pre3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index f4852ffef8b..0b9e4df3fd3 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -2,10 +2,11 @@ = render "projects/merge_requests/show/mr_title" = render "projects/merge_requests/show/how_to_merge" = render "projects/merge_requests/show/mr_box" - - if @merge_request.source_branch_exists? && @merge_request.target_branch_exists? - = render "projects/merge_requests/show/mr_accept" - - else - = render "projects/merge_requests/show/no_accept" + - if @merge_request.opened? + - if @merge_request.source_branch_exists? && @merge_request.target_branch_exists? + = render "projects/merge_requests/show/mr_accept" + - else + = render "projects/merge_requests/show/no_accept" - if @merge_request.source_project.gitlab_ci? = render "projects/merge_requests/show/mr_ci" = render "projects/merge_requests/show/commits" |