Commit a1b78da4 authored by David O'Regan's avatar David O'Regan

Merge branch 'pb-ux-ci-cd-toggle-setting' into 'master'

Rename pipelines setting to CI/CD and reposition

See merge request gitlab-org/gitlab!56857
parents 8b4ce154 3024b2c3
...@@ -481,18 +481,6 @@ export default { ...@@ -481,18 +481,6 @@ export default {
name="project[project_feature_attributes][forking_access_level]" name="project[project_feature_attributes][forking_access_level]"
/> />
</project-setting-row> </project-setting-row>
<project-setting-row
ref="pipeline-settings"
:label="s__('ProjectSettings|Pipelines')"
:help-text="s__('ProjectSettings|Build, test, and deploy your changes.')"
>
<project-feature-setting
v-model="buildsAccessLevel"
:options="repoFeatureAccessLevelOptions"
:disabled-input="!repositoryEnabled"
name="project[project_feature_attributes][builds_access_level]"
/>
</project-setting-row>
<project-setting-row <project-setting-row
v-if="registryAvailable" v-if="registryAvailable"
ref="container-registry-settings" ref="container-registry-settings"
...@@ -566,6 +554,18 @@ export default { ...@@ -566,6 +554,18 @@ export default {
/> />
</project-setting-row> </project-setting-row>
</div> </div>
<project-setting-row
ref="pipeline-settings"
:label="__('CI/CD')"
:help-text="s__('ProjectSettings|Build, test, and deploy your changes.')"
>
<project-feature-setting
v-model="buildsAccessLevel"
:options="repoFeatureAccessLevelOptions"
:disabled-input="!repositoryEnabled"
name="project[project_feature_attributes][builds_access_level]"
/>
</project-setting-row>
<project-setting-row <project-setting-row
ref="analytics-settings" ref="analytics-settings"
:label="s__('ProjectSettings|Analytics')" :label="s__('ProjectSettings|Analytics')"
......
---
title: Rename pipelines setting to CI/CD and move out from under repository section
merge_request: 56857
author:
type: changed
...@@ -24052,9 +24052,6 @@ msgstr "" ...@@ -24052,9 +24052,6 @@ msgstr ""
msgid "ProjectSettings|Pages for project documentation." msgid "ProjectSettings|Pages for project documentation."
msgstr "" msgstr ""
msgid "ProjectSettings|Pipelines"
msgstr ""
msgid "ProjectSettings|Pipelines must succeed" msgid "ProjectSettings|Pipelines must succeed"
msgstr "" msgstr ""
......
...@@ -228,7 +228,7 @@ describe('Settings Panel', () => { ...@@ -228,7 +228,7 @@ describe('Settings Panel', () => {
}); });
}); });
describe('Pipelines', () => { describe('CI/CD', () => {
it('should enable the builds access level input when the repository is enabled', () => { it('should enable the builds access level input when the repository is enabled', () => {
wrapper = mountComponent({ wrapper = mountComponent({
currentSettings: { repositoryAccessLevel: featureAccessLevel.EVERYONE }, currentSettings: { repositoryAccessLevel: featureAccessLevel.EVERYONE },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment