summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-09-19 17:53:02 +0000
committerStan Hu <stanhu@gmail.com>2017-09-19 17:53:02 +0000
commit5ca29a45b19eb97c42145bb5a11e593a958dafbc (patch)
tree042a568ae2e1079d0aa40c9cdac69a5f3a24571b
parente5b0f2167d341954c72ba885ab3154b158b322a5 (diff)
parent0de6dbeccf589c4bdca3c7e8d29cfa1121012a33 (diff)
downloadgitlab-ce-5ca29a45b19eb97c42145bb5a11e593a958dafbc.tar.gz
Merge branch '37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project' into 'master'
Resolve "Auto DevOps banner is not shown when the repository is empty (new project)" Closes #37890 See merge request gitlab-org/gitlab-ce!14321
-rw-r--r--app/views/projects/empty.html.haml2
-rw-r--r--changelogs/unreleased/37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project.yml5
2 files changed, 7 insertions, 0 deletions
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index 5e980314307..d5b83b53ebb 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -27,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
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..2dddfa0b882
--- /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