Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
3024b2c3
Commit
3024b2c3
authored
Mar 18, 2021
by
Payton Burdette
Committed by
David O'Regan
Mar 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move project setting
Move project setting for pipelines under CI/CD.
parent
e1ad2193
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
16 deletions
+18
-16
app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
...projects/shared/permissions/components/settings_panel.vue
+12
-12
changelogs/unreleased/pb-ux-ci-cd-toggle-setting.yml
changelogs/unreleased/pb-ux-ci-cd-toggle-setting.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+0
-3
spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js
...ects/shared/permissions/components/settings_panel_spec.js
+1
-1
No files found.
app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
View file @
3024b2c3
...
...
@@ -481,18 +481,6 @@ export default {
name=
"project[project_feature_attributes][forking_access_level]"
/>
</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
v-if=
"registryAvailable"
ref=
"container-registry-settings"
...
...
@@ -566,6 +554,18 @@ export default {
/>
</project-setting-row>
</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
ref=
"analytics-settings"
:label=
"s__('ProjectSettings|Analytics')"
...
...
changelogs/unreleased/pb-ux-ci-cd-toggle-setting.yml
0 → 100644
View file @
3024b2c3
---
title
:
Rename pipelines setting to CI/CD and move out from under repository section
merge_request
:
56857
author
:
type
:
changed
locale/gitlab.pot
View file @
3024b2c3
...
...
@@ -24052,9 +24052,6 @@ msgstr ""
msgid "ProjectSettings|Pages for project documentation."
msgstr ""
msgid "ProjectSettings|Pipelines"
msgstr ""
msgid "ProjectSettings|Pipelines must succeed"
msgstr ""
...
...
spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js
View file @
3024b2c3
...
...
@@ -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
'
,
()
=>
{
wrapper
=
mountComponent
({
currentSettings
:
{
repositoryAccessLevel
:
featureAccessLevel
.
EVERYONE
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment