diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 03:09:12 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 03:09:12 +0000 |
commit | 3591ecba91126089ebf916f9bd95fe497609920c (patch) | |
tree | 139e2f7ebdc0e11b62ad1b0e5bfbdf18a6f2ddf2 /config | |
parent | 38c1da5195bdcaab0b20bf6303a675b9283ac476 (diff) | |
download | gitlab-ce-3591ecba91126089ebf916f9bd95fe497609920c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/dependency_decisions.yml | 4 | ||||
-rw-r--r-- | config/feature_flags/development/explain_vulnerability_vertex.yml (renamed from config/feature_flags/development/tofa_experimentation.yml) | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 2e6bd69fa15..e74e9367304 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -378,6 +378,6 @@ - - :approve - elkjs - :who: John T Skarbek - :why: https://github.com/mermaid-js/mermaid/pull/3984 - :versions: [] + :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/1505 + :versions: ["0.8.2"] :when: 2023-04-07 09:15:33.00004000 Z diff --git a/config/feature_flags/development/tofa_experimentation.yml b/config/feature_flags/development/explain_vulnerability_vertex.yml index b00f1679793..f93be4fc22c 100644 --- a/config/feature_flags/development/tofa_experimentation.yml +++ b/config/feature_flags/development/explain_vulnerability_vertex.yml @@ -1,7 +1,7 @@ --- -name: tofa_experimentation +name: explain_vulnerability_vertex introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118754 -rollout_issue_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409182 milestone: '16.0' type: development group: group::threat insights |