Skip to content
代码片段 群组 项目
未验证 提交 e3a8700b 编辑于 作者: Alexander Turinske's avatar Alexander Turinske 提交者: GitLab
浏览文件

Merge branch '500650-policies-bug-specific-projects-full-path' into 'master'

Change root namespace for specific projects

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170873



Merged-by: default avatarAlexander Turinske <aturinske@gitlab.com>
Approved-by: default avatarAlexander Turinske <aturinske@gitlab.com>
Co-authored-by: default avatarArtur Fedorov <afedorov@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -197,9 +197,6 @@ export default { ...@@ -197,9 +197,6 @@ export default {
isProjectLevel() { isProjectLevel() {
return isProject(this.namespaceType); return isProject(this.namespaceType);
}, },
groupProjectsFullPath() {
return this.isGroupLevel ? this.namespacePath : this.rootNamespacePath;
},
hasMultipleProjectsLinked() { hasMultipleProjectsLinked() {
return this.linkedSppItems.length > 1; return this.linkedSppItems.length > 1;
}, },
...@@ -447,7 +444,7 @@ export default { ...@@ -447,7 +444,7 @@ export default {
:is-dirty="isFormDirty" :is-dirty="isFormDirty"
:exception-type="selectedExceptionType" :exception-type="selectedExceptionType"
:projects="projects" :projects="projects"
:group-full-path="groupProjectsFullPath" :group-full-path="rootNamespacePath"
@error="setShowAlert($options.i18n.groupProjectErrorDescription)" @error="setShowAlert($options.i18n.groupProjectErrorDescription)"
@select-exception-type="selectExceptionType" @select-exception-type="selectExceptionType"
@changed="setSelectedItems" @changed="setSelectedItems"
......
...@@ -529,7 +529,7 @@ describe('PolicyScope', () => { ...@@ -529,7 +529,7 @@ describe('PolicyScope', () => {
describe('namespace', () => { describe('namespace', () => {
it.each` it.each`
namespaceType | expectedResult namespaceType | expectedResult
${NAMESPACE_TYPES.GROUP} | ${'gitlab-org'} ${NAMESPACE_TYPES.GROUP} | ${'gitlab-org-root'}
${NAMESPACE_TYPES.PROJECT} | ${'gitlab-org-root'} ${NAMESPACE_TYPES.PROJECT} | ${'gitlab-org-root'}
`( `(
'queries different namespaces on group and project level', 'queries different namespaces on group and project level',
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册