Merge branch…

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

Merge branch…
5ca29a45 · Stan Hu · e5b0f216 · 0de6dbec · 5ca29a45 · 5ca29a45
Commit 5ca29a45 authored Sep 19, 2017 by Stan Hu
Showing with 7 additions and 0 deletions

empty.html.haml app/views/projects/empty.html.haml +2 -0

37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project.yml ...is-not-shown-when-the-repository-is-empty-new-project.yml +5 -0

No files found.
--- 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

--- 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
+---
+title: Fix Auto DevOps banner to be shown on empty projects
+merge_request:
+author:
+type: fixed