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

Merge branch 'sk/fix-group-approvers' into 'master'

Fix reference to groupApprovers in security approvals

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



Merged-by: default avatarAlexander Turinske <aturinske@gitlab.com>
Approved-by: default avatarAlexander Turinske <aturinske@gitlab.com>
Co-authored-by: default avatarSashi Kumar <skumar@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -20,7 +20,7 @@ export const fetchScanResultPolicies = ({ commit }, { fullPath }) => { ...@@ -20,7 +20,7 @@ export const fetchScanResultPolicies = ({ commit }, { fullPath }) => {
return { return {
...fromYaml({ manifest: rawPolicy.yaml }), ...fromYaml({ manifest: rawPolicy.yaml }),
isSelected: false, isSelected: false,
approvers: [...rawPolicy.userApprovers, ...rawPolicy.groupApprovers], approvers: [...rawPolicy.userApprovers, ...rawPolicy.allGroupApprovers],
source: rawPolicy.source || { project: { fullPath } }, source: rawPolicy.source || { project: { fullPath } },
}; };
} catch (e) { } catch (e) {
......
...@@ -24,7 +24,7 @@ describe('security orchestration actions', () => { ...@@ -24,7 +24,7 @@ describe('security orchestration actions', () => {
name: 'policyName', name: 'policyName',
yaml: 'name: policyName', yaml: 'name: policyName',
userApprovers: [{ id: 1, name: 'username' }], userApprovers: [{ id: 1, name: 'username' }],
groupApprovers: [], allGroupApprovers: [],
source: { project: { fullPath: 'path/policy' } }, source: { project: { fullPath: 'path/policy' } },
}, },
]; ];
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册