summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-11 09:06:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-11 09:06:38 +0000
commit4a45f0eff2a25c64bdd83926e35a8894a4f0469f (patch)
tree8068fff1731ccf4182605c2661c25f0a1c936866 /config
parentd9c3a63a4394990bcdccbaca73c58278469236b4 (diff)
downloadgitlab-ce-4a45f0eff2a25c64bdd83926e35a8894a4f0469f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/dependency_decisions.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index 5346bf45473..84db15d6535 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -620,3 +620,9 @@
:why: https://github.com/hexorx/countries/blob/master/LICENSE
:versions: []
:when: 2019-09-11 13:08:28.431132000 Z
+- - :whitelist
+ - "(MIT OR CC0-1.0)"
+ - :who:
+ :why:
+ :versions: []
+ :when: 2019-11-08 10:03:31.787226000 Z