From 354df65295028ac09ed7e4a924e39ff567b38a4b Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Fri, 1 Sep 2017 12:18:00 +0100 Subject: [PATCH] Creates auto devops callout --- app/assets/javascripts/dispatcher.js | 10 ++++++ .../pipelines/components/pipelines.vue | 5 +-- .../projects/merge_requests/index.html.haml | 2 ++ app/views/projects/pipelines/index.html.haml | 35 ++++++++++--------- app/views/projects/show.html.haml | 3 ++ app/views/projects/tree/show.html.haml | 2 ++ .../shared/_auto_devops_callout.html.haml | 17 +++++++++ app/views/shared/icons/_icon_autodevops.svg | 1 + .../unreleased/37158-autodevops-banner.yml | 5 +++ 9 files changed, 60 insertions(+), 20 deletions(-) create mode 100644 app/views/shared/_auto_devops_callout.html.haml create mode 100644 app/views/shared/icons/_icon_autodevops.svg create mode 100644 changelogs/unreleased/37158-autodevops-banner.yml diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index c70a17104fd..2b98bdeb54d 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -155,6 +155,9 @@ import initChangesDropdown from './init_changes_dropdown'; shortcut_handler = new ShortcutsNavigation(); new UsersSelect(); break; + case 'projects:merge_requests:index': + new UserCallout(); + break; case 'projects:merge_requests:index': case 'projects:issues:index': if (filteredSearchEnabled) { @@ -344,6 +347,7 @@ import initChangesDropdown from './init_changes_dropdown'; case 'projects:show': shortcut_handler = new ShortcutsNavigation(); new NotificationsForm(); + new UserCallout(); if ($('#tree-slider').length) new TreeView(); if ($('.blob-viewer').length) new BlobViewer(); @@ -363,6 +367,9 @@ import initChangesDropdown from './init_changes_dropdown'; case 'projects:pipelines:new': new NewBranchForm($('.js-new-pipeline-form')); break; + case 'projects:pipelines:index': + new UserCallout(); + break; case 'projects:pipelines:builds': case 'projects:pipelines:failures': case 'projects:pipelines:show': @@ -378,6 +385,8 @@ import initChangesDropdown from './init_changes_dropdown'; parentEl: '.pipelines-tabs', }, }); + + new UserCallout(); break; case 'groups:activity': new gl.Activities(); @@ -420,6 +429,7 @@ import initChangesDropdown from './init_changes_dropdown'; new TreeView(); new BlobViewer(); new NewCommitForm($('.js-create-dir-form')); + new UserCallout(); $('#tree-slider').waitForImages(function() { gl.utils.ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath); }); diff --git a/app/assets/javascripts/pipelines/components/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines.vue index 75e40da6d28..49c87bf5e91 100644 --- a/app/assets/javascripts/pipelines/components/pipelines.vue +++ b/app/assets/javascripts/pipelines/components/pipelines.vue @@ -25,7 +25,6 @@ return { endpoint: pipelinesData.endpoint, - cssClass: pipelinesData.cssClass, helpPagePath: pipelinesData.helpPagePath, autoDevopsPath: pipelinesData.helpautoDevopsPath, newPipelinePath: pipelinesData.newPipelinePath, @@ -140,9 +139,7 @@ };