From afc4c6b93badc535aacc884e9745b00b88195f01 Mon Sep 17 00:00:00 2001 From: bokebilly Date: Sun, 17 Sep 2017 00:15:18 +0200 Subject: [PATCH 1/8] Add banner in missing pages --- app/views/projects/empty.html.haml | 4 ++++ app/views/projects/merge_requests/index.html.haml | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 5e980314307..21fbfb1197a 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -6,6 +6,10 @@ = render "projects/head" = render "home_panel" +%div{ 'class' => container_class } + - if show_auto_devops_callout?(@project) + = render 'shared/auto_devops_callout' + .row-content-block.second-block.center %h3.page-title The repository for this project is empty diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index 2c53891a92d..b257996e171 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -14,10 +14,12 @@ = render 'projects/last_push' +%div{ class: container_class } + - if show_auto_devops_callout?(@project) + = render 'shared/auto_devops_callout' + - if @project.merge_requests.exists? %div{ class: container_class } - - if show_auto_devops_callout?(@project) - = render 'shared/auto_devops_callout' .top-area = render 'shared/issuable/nav', type: :merge_requests .nav-controls From eb63eaa0f275c4dd8c563fac9d85993e20a9c039 Mon Sep 17 00:00:00 2001 From: bikebilly Date: Mon, 18 Sep 2017 19:20:12 +0200 Subject: [PATCH 2/8] Remove double div --- app/views/projects/empty.html.haml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 21fbfb1197a..d5b83b53ebb 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -6,10 +6,6 @@ = render "projects/head" = render "home_panel" -%div{ 'class' => container_class } - - if show_auto_devops_callout?(@project) - = render 'shared/auto_devops_callout' - .row-content-block.second-block.center %h3.page-title The repository for this project is empty @@ -31,6 +27,8 @@ - if can?(current_user, :push_code, @project) %div{ class: container_class } + - if show_auto_devops_callout?(@project) + = render 'shared/auto_devops_callout' .prepend-top-20 .empty_wrapper %h3.page-title-empty From 584c949d07fcb405005ec053c5b0a288bd44cedd Mon Sep 17 00:00:00 2001 From: bikebilly Date: Mon, 18 Sep 2017 19:31:37 +0200 Subject: [PATCH 3/8] Remove double div in MR --- app/views/projects/merge_requests/index.html.haml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index b257996e171..ccff5caf120 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -14,12 +14,11 @@ = render 'projects/last_push' -%div{ class: container_class } - - if show_auto_devops_callout?(@project) - = render 'shared/auto_devops_callout' - - if @project.merge_requests.exists? %div{ class: container_class } + - if show_auto_devops_callout?(@project) + = render 'shared/auto_devops_callout' + .top-area = render 'shared/issuable/nav', type: :merge_requests .nav-controls From 428d5e0a5e3a45e622793c4edcd0b5a82e2d61a9 Mon Sep 17 00:00:00 2001 From: Fabio Busatto Date: Mon, 18 Sep 2017 17:37:57 +0000 Subject: [PATCH 4/8] Add new file --- ...is-not-shown-when-the-repository-is-empty-new-project.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project.yml diff --git a/changelogs/unreleased/37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project.yml b/changelogs/unreleased/37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project.yml new file mode 100644 index 00000000000..81826a6f335 --- /dev/null +++ b/changelogs/unreleased/37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project.yml @@ -0,0 +1,5 @@ +--- +title: Fix Auto DevOps banner to be shown on empty projects +merge_request: +author: +type: fixed \ No newline at end of file From 30313d3745179bd2c65931b933cd3490afd93f8c Mon Sep 17 00:00:00 2001 From: bikebilly Date: Mon, 18 Sep 2017 19:50:19 +0200 Subject: [PATCH 5/8] Enhance reuse in MR --- app/views/projects/merge_requests/index.html.haml | 13 ++++++------- 1 file 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 From 8c5f51d15aef9307ffd929e3fefb9bf3948678ab Mon Sep 17 00:00:00 2001 From: bikebilly Date: Mon, 18 Sep 2017 20:41:05 +0200 Subject: [PATCH 6/8] Enhance reuse in MR --- app/views/projects/merge_requests/index.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index 9ab5347101e..968ec7d9abf 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -17,6 +17,7 @@ %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 From 79d26c5be76c716c872f47418ce1280fefd9b0bb Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 19 Sep 2017 15:13:26 +0200 Subject: [PATCH 7/8] Revert changes made to merge requests blank slate --- app/views/projects/merge_requests/index.html.haml | 13 ++++++------- 1 file 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 968ec7d9abf..2c53891a92d 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' -%div{ class: container_class } - - if show_auto_devops_callout?(@project) - = render 'shared/auto_devops_callout' - - - if @project.merge_requests.exists? +- if @project.merge_requests.exists? + %div{ class: container_class } + - if show_auto_devops_callout?(@project) + = render 'shared/auto_devops_callout' .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 From 0de6dbeccf589c4bdca3c7e8d29cfa1121012a33 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 19 Sep 2017 15:13:50 +0200 Subject: [PATCH 8/8] Fix changelog --- ...er-is-not-shown-when-the-repository-is-empty-new-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project.yml b/changelogs/unreleased/37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project.yml index 81826a6f335..2dddfa0b882 100644 --- a/changelogs/unreleased/37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project.yml +++ b/changelogs/unreleased/37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project.yml @@ -2,4 +2,4 @@ title: Fix Auto DevOps banner to be shown on empty projects merge_request: author: -type: fixed \ No newline at end of file +type: fixed