diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-04 14:32:25 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-04 14:32:25 +0000 |
| commit | 597bc29260c4be3a1527a1c5307bec40004bac4d (patch) | |
| tree | 87bd43ea1c6d808c5bc057ba812936d413cee001 /config | |
| parent | d47a00c35706b70b89a39092861bd40e731cf5c9 (diff) | |
| parent | 9f48181885d2e276aa237c48a99f05601460d01e (diff) | |
| download | gitlab-ce-597bc29260c4be3a1527a1c5307bec40004bac4d.tar.gz | |
Merge branch 'forbid-fb-bsd-patents' into 'master'
Add Facebook BSD+PATENTS license to the "unacceptable" list
See merge request !14029
Diffstat (limited to 'config')
| -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 c9018f3bf0e..d6c3c84851b 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -410,3 +410,9 @@ :why: https://gitlab.com/gitlab-com/organization/issues/116 :versions: [] :when: 2017-09-01 17:17:51.996511844 Z +- - :blacklist + - Facebook BSD+PATENTS + - :who: Nick Thomas <nick@gitlab.com> + :why: https://gitlab.com/gitlab-com/organization/issues/117 + :versions: [] + :when: 2017-09-04 12:59:51.150798717 Z |