diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-05 17:15:59 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-05 17:15:59 +0300 |
| commit | ef5195ebe155f69dbf719e151779b01e7bf4007d (patch) | |
| tree | d33a0312f124c4615c343c7a03d57ca234bf8ae7 | |
| parent | da5e49aa836ea4eba6de7c0c78e911748a3ad733 (diff) | |
| parent | bea68b230abfa61e5f0d41c1e2d931ea9a35102d (diff) | |
Merge branch 'license-mgmt' into 'master'
Enable GitLab license management
See merge request gitlab-org/gitlab-pages!142
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | doc/dependency_decisions.yml | 71 |
2 files changed, 78 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9bb16dd..43bbb93f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +include: + template: License-Management.gitlab-ci.yml + .test: &test script: - echo "Running all tests without daemonizing..." @@ -10,6 +13,10 @@ paths: - bin/gitlab-pages +license_management: + variables: + SETUP_CMD: echo "Skip setup. Dependency already vendored" + verify: image: golang:1.11 script: diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml new file mode 100644 index 00000000..8fe98d3a --- /dev/null +++ b/doc/dependency_decisions.yml @@ -0,0 +1,71 @@ +--- +- - :license + - github.com/beorn7/perks/quantile + - MIT + - :who: + :why: + :versions: [] + :when: 2019-04-03 13:58:37.693164000 Z +- - :license + - github.com/matttproud/golang_protobuf_extensions/pbutil + - Apache 2.0 + - :who: + :why: + :versions: [] + :when: 2019-04-03 15:08:10.359320000 Z +- - :license + - github.com/karrick/godirwalk + - BSD-2-Clause + - :who: + :why: + :versions: [] + :when: 2019-04-03 15:09:35.519709000 Z +- - :license + - github.com/pkg/errors + - BSD-2-Clause + - :who: + :why: + :versions: [] + :when: 2019-04-03 15:10:49.901903000 Z +- - :license + - github.com/prometheus/client_golang/prometheus + - Apache-2.0 + - :who: + :why: + :versions: [] + :when: 2019-04-03 15:11:57.417366000 Z +- - :license + - github.com/prometheus/client_model/go + - Apache-2.0 + - :who: + :why: + :versions: [] + :when: 2019-04-03 15:14:16.841551000 Z +- - :license + - gitlab.com/gitlab-org/gitaly/auth + - MIT + - :who: + :why: + :versions: [] + :when: 2019-04-03 15:15:26.240245000 Z +- - :license + - gitlab.com/gitlab-org/gitlab-pages-proto/go + - MIT + - :who: + :why: + :versions: [] + :when: 2019-04-03 15:16:18.620931000 Z +- - :license + - google.golang.org/genproto/googleapis/rpc/status + - Apache-2.0 + - :who: + :why: + :versions: [] + :when: 2019-04-03 15:19:19.394529000 Z +- - :license + - golang.org/x/crypto/ssh/terminal + - BSD-3-clause + - :who: + :why: + :versions: [] + :when: 2019-04-05 10:26:09.636346000 Z |