diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-12-06 22:26:39 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-12-06 22:26:39 +0000 |
commit | 0f338434b90b6e385c0c1947ff53c143dd7ed6be (patch) | |
tree | 90467ff623c98a3bd90a46dcf2db2a5694898d98 /config | |
parent | 596567e8ea451561fcb2b1eb4bb2df3a6870c5cc (diff) | |
parent | 2e2c1959f744bd1e903049a36cc8cead44847a3b (diff) | |
download | gitlab-ce-0f338434b90b6e385c0c1947ff53c143dd7ed6be.tar.gz |
Merge branch 'mg-upgrade-gitlab-ui' into 'master'
Upgrade gitlab-ui dependency
See merge request gitlab-org/gitlab-ce!23611
Diffstat (limited to 'config')
-rw-r--r-- | config/dependency_decisions.yml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 84d47bd52ad..6e4f7ce30a0 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -470,8 +470,8 @@ - - :license - pikaday - MIT - - :who: - :why: + - :who: Filipa Lacerda + :why: MIT License :versions: [] :when: 2017-10-17 17:46:12.367554000 Z - - :license @@ -592,3 +592,9 @@ in compiled/distributed product so attribution not needed. :versions: [] :when: 2018-10-02 19:23:54.840151000 Z +- - :approve + - echarts + - :who: Mike Greiling + :why: https://github.com/apache/incubator-echarts/blob/master/LICENSE + :versions: [] + :when: 2018-12-05 22:12:30.550027000 Z |