summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbikebilly <fabio@gitlab.com>2017-09-18 19:50:19 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2017-09-19 15:12:55 +0200
commit30313d3745179bd2c65931b933cd3490afd93f8c (patch)
tree59f4d353624c338d768de4f7983f8af01457fba3
parent428d5e0a5e3a45e622793c4edcd0b5a82e2d61a9 (diff)
downloadgitlab-ce-30313d3745179bd2c65931b933cd3490afd93f8c.tar.gz
Enhance reuse in MR
-rw-r--r--app/views/projects/merge_requests/index.html.haml13
1 files changed, 6 insertions, 7 deletions
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index ccff5caf120..9ab5347101e 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -14,11 +14,10 @@
= render 'projects/last_push'
-- if @project.merge_requests.exists?
- %div{ class: container_class }
- - if show_auto_devops_callout?(@project)
- = render 'shared/auto_devops_callout'
-
+%div{ class: container_class }
+ - if show_auto_devops_callout?(@project)
+ = render 'shared/auto_devops_callout'
+ - if @project.merge_requests.exists?
.top-area
= render 'shared/issuable/nav', type: :merge_requests
.nav-controls
@@ -31,5 +30,5 @@
.merge-requests-holder
= render 'merge_requests'
-- else
- = render 'shared/empty_states/merge_requests', button_path: new_merge_request_path
+ - else
+ = render 'shared/empty_states/merge_requests', button_path: new_merge_request_path