diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2017-09-13 11:53:00 +0000 |
---|---|---|
committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-14 15:03:12 +0200 |
commit | 307d37de894912537ad905fe9200471fd5e8f8e8 (patch) | |
tree | 2063925bfd8a806420c77203b0068e963e96b120 | |
parent | 2f277bb9a0c7f95febaa630f465ea31e3e163bad (diff) | |
download | gitlab-ce-307d37de894912537ad905fe9200471fd5e8f8e8.tar.gz |
Merge branch 'zj-auto-devops-banner' into 'master'
AutoDevOps banner hidden on explicit CI config
Closes #37652
See merge request !14207
-rw-r--r-- | app/helpers/auto_devops_helper.rb | 4 | ||||
-rw-r--r-- | changelogs/unreleased/zj-auto-devops-banner.yml | 6 | ||||
-rw-r--r-- | spec/helpers/auto_devops_helper_spec.rb | 16 |
3 files changed, 25 insertions, 1 deletions
diff --git a/app/helpers/auto_devops_helper.rb b/app/helpers/auto_devops_helper.rb index c132daed323..c455d18cff8 100644 --- a/app/helpers/auto_devops_helper.rb +++ b/app/helpers/auto_devops_helper.rb @@ -3,6 +3,8 @@ module AutoDevopsHelper Feature.get(:auto_devops_banner_disabled).off? && show_callout?('auto_devops_settings_dismissed') && can?(current_user, :admin_pipeline, project) && - project.has_auto_devops_implicitly_disabled? + project.has_auto_devops_implicitly_disabled? && + !project.repository.gitlab_ci_yml && + project.ci_services.active.none? end end diff --git a/changelogs/unreleased/zj-auto-devops-banner.yml b/changelogs/unreleased/zj-auto-devops-banner.yml new file mode 100644 index 00000000000..a2abed0b2ec --- /dev/null +++ b/changelogs/unreleased/zj-auto-devops-banner.yml @@ -0,0 +1,6 @@ +--- +title: Do not show the Auto DevOps banner when the project has a .gitlab-ci.yml on + master +merge_request: +author: +type: fixed diff --git a/spec/helpers/auto_devops_helper_spec.rb b/spec/helpers/auto_devops_helper_spec.rb index 80d58ff6bf7..5e272af6073 100644 --- a/spec/helpers/auto_devops_helper_spec.rb +++ b/spec/helpers/auto_devops_helper_spec.rb @@ -65,5 +65,21 @@ describe AutoDevopsHelper do it { is_expected.to eq(false) } end + + context 'when master contains a .gitlab-ci.yml file' do + before do + allow(project.repository).to receive(:gitlab_ci_yml).and_return("script: ['test']") + end + + it { is_expected.to eq(false) } + end + + context 'when another service is enabled' do + before do + create(:service, project: project, category: :ci, active: true) + end + + it { is_expected.to eq(false) } + end end end |