5 files changed, 27 insertions, 17 deletions
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index fc7190505da..2c53891a92d 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -16,6 +16,8 @@
 
 - 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
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 579f681abaa..9fc15d20f34 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -2,20 +2,23 @@
 - page_title "Pipelines"
 = render "projects/pipelines/head"
 
-#pipelines-list-vue{ data: { endpoint: project_pipelines_path(@project, format: :json),
-  "css-class" => container_class,
-  "help-page-path" => help_page_path('ci/quick_start/README'),
-  "help-auto-devops-path" => help_page_path('topics/autodevops/index.md'),
-  "new-pipeline-path" => new_project_pipeline_path(@project),
-  "can-create-pipeline" => can?(current_user, :create_pipeline, @project).to_s,
-  "all-path" =>  project_pipelines_path(@project),
-  "pending-path" => project_pipelines_path(@project, scope: :pending),
-  "running-path" => project_pipelines_path(@project, scope: :running),
-  "finished-path" => project_pipelines_path(@project, scope: :finished),
-  "branches-path" => project_pipelines_path(@project, scope: :branches),
-  "tags-path" => project_pipelines_path(@project, scope: :tags),
-  "has-ci" => @project.has_ci?,
-  "ci-lint-path" => ci_lint_path } }
+%div{ 'class' => container_class }
+  - if show_auto_devops_callout?(@project)
+    = render 'shared/auto_devops_callout'
 
-= page_specific_javascript_bundle_tag('common_vue')
-= page_specific_javascript_bundle_tag('pipelines')
+  #pipelines-list-vue{ data: { endpoint: project_pipelines_path(@project, format: :json),
+    "help-page-path" => help_page_path('ci/quick_start/README'),
+    "help-auto-devops-path" => help_page_path('topics/autodevops/index.md'),
+    "new-pipeline-path" => new_project_pipeline_path(@project),
+    "can-create-pipeline" => can?(current_user, :create_pipeline, @project).to_s,
+    "all-path" =>  project_pipelines_path(@project),
+    "pending-path" => project_pipelines_path(@project, scope: :pending),
+    "running-path" => project_pipelines_path(@project, scope: :running),
+    "finished-path" => project_pipelines_path(@project, scope: :finished),
+    "branches-path" => project_pipelines_path(@project, scope: :branches),
+    "tags-path" => project_pipelines_path(@project, scope: :tags),
+    "has-ci" => @project.has_ci?,
+    "ci-lint-path" => ci_lint_path } }
+
+  = page_specific_javascript_bundle_tag('common_vue')
+  = page_specific_javascript_bundle_tag('pipelines')
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index eaf374bcb83..d4f71d023c6 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -6,7 +6,7 @@
 
 - expanded = Rails.env.test?
 
-%section.settings
+%section.settings#js-general-pipeline-settings
   .settings-header
     %h4
       General pipelines settings
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 6ee55bba82a..d8f5114f4b5 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -82,5 +82,8 @@
 
   - view_path = default_project_view
 
+  - if show_auto_devops_callout?(@project)
+    = render 'shared/auto_devops_callout'
+
   %div{ class: project_child_container_class(view_path) }
     = render view_path
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 375e6764add..d84a1fd7ee1 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -14,5 +14,7 @@
 = render "projects/commits/head"
 
 %div{ class: [container_class, ("limit-container-width" unless fluid_layout)] }
+  - if show_auto_devops_callout?(@project)
+    = render 'shared/auto_devops_callout'
   = render 'projects/last_push'
   = render 'projects/files', commit: @last_commit, project: @project, ref: @ref, content_url: project_tree_path(@project, @id)