diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /config/dependency_decisions.yml | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'config/dependency_decisions.yml')
-rw-r--r-- | config/dependency_decisions.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 9256b902634..2f0d9066a7a 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -313,3 +313,9 @@ :why: "https://github.com/cure53/DOMPurify/blob/main/LICENSE and https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31928#note_346604841" :versions: [] :when: 2020-08-13 13:42:46.508082000 Z +- - :whitelist + - Apache-2.0 WITH LLVM-exception + - :who: Nathan Friend + :why: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40670#note_403946372 + :versions: [] + :when: 2020-08-28 15:01:59.329048917 Z |