summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-09-04 08:26:24 +0000
committerDouwe Maan <douwe@gitlab.com>2017-09-04 08:26:24 +0000
commit34ef6dc147b413b1f2f8faf2f26c9e1327830874 (patch)
treeee8198c153b9913cf8855ed5147ced0b3b38ece4 /config
parent1f59564fbf7b48350b43cc3e1659c33c92759151 (diff)
parent3699362e9fe2dc67247f9ea9c1b74816054b2a74 (diff)
downloadgitlab-ce-34ef6dc147b413b1f2f8faf2f26c9e1327830874.tar.gz
Merge branch 'approve-unlicense' into 'master'
Approve the Unlicense See merge request !14001
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 ca5b941aebf..c9018f3bf0e 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -404,3 +404,9 @@
:why: https://github.com/mafintosh/thunky/blob/master/README.md#license
:versions: []
:when: 2017-08-07 05:56:09.907045000 Z
+- - :whitelist
+ - Unlicense
+ - :who: Nick Thomas <nick@gitlab.com>
+ :why: https://gitlab.com/gitlab-com/organization/issues/116
+ :versions: []
+ :when: 2017-09-01 17:17:51.996511844 Z