Commit 0f338434 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'mg-upgrade-gitlab-ui' into 'master'

Upgrade gitlab-ui dependency

See merge request gitlab-org/gitlab-ce!23611
parents 596567e8 2e2c1959
...@@ -470,8 +470,8 @@ ...@@ -470,8 +470,8 @@
- - :license - - :license
- pikaday - pikaday
- MIT - MIT
- :who: - :who: Filipa Lacerda
:why: :why: MIT License
:versions: [] :versions: []
:when: 2017-10-17 17:46:12.367554000 Z :when: 2017-10-17 17:46:12.367554000 Z
- - :license - - :license
...@@ -592,3 +592,9 @@ ...@@ -592,3 +592,9 @@
in compiled/distributed product so attribution not needed. in compiled/distributed product so attribution not needed.
:versions: [] :versions: []
:when: 2018-10-02 19:23:54.840151000 Z :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
...@@ -634,14 +634,15 @@ ...@@ -634,14 +634,15 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.41.0.tgz#f80e3a0e259f3550af00685556ea925e471276d3" resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.41.0.tgz#f80e3a0e259f3550af00685556ea925e471276d3"
integrity sha512-tKUXyqe54efWBsjQBUcvNF0AvqmE2NI2No3Bnix/gKDRImzIlcgIkM67Y8zoJv1D0w4CO87WcaG5GLpIFIT1Pg== integrity sha512-tKUXyqe54efWBsjQBUcvNF0AvqmE2NI2No3Bnix/gKDRImzIlcgIkM67Y8zoJv1D0w4CO87WcaG5GLpIFIT1Pg==
"@gitlab/ui@^1.11.0": "@gitlab/ui@^1.14.0":
version "1.11.0" version "1.14.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-1.11.0.tgz#b771c2c3d627cf9efbe98c71ee5739624f2ff51f" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-1.14.0.tgz#f0fd7c0e6c45a36ab3be18d00e2908a8cb405f90"
integrity sha512-hGMHM45kcv9725R6G+n/HxvF3KfVb9oBGRNf1+4n3xAGmtXJ2NlPdIXIsDaye3EeVF9PTOtjLuaqrcp6AGNqZg== integrity sha512-jkBTN8qO41A894kcLo6b/mfLIgL8YNn+ZzjgzEXaZ3PyeQ3mKBdrBoSYkzH556qviroBvk/+3yyZz96VUo08qQ==
dependencies: dependencies:
babel-standalone "^6.26.0" babel-standalone "^6.26.0"
bootstrap-vue "^2.0.0-rc.11" bootstrap-vue "^2.0.0-rc.11"
copy-to-clipboard "^3.0.8" copy-to-clipboard "^3.0.8"
echarts "^4.2.0-rc.2"
highlight.js "^9.13.1" highlight.js "^9.13.1"
js-beautify "^1.8.8" js-beautify "^1.8.8"
lodash "^4.17.11" lodash "^4.17.11"
...@@ -3278,6 +3279,13 @@ ecc-jsbn@~0.1.1: ...@@ -3278,6 +3279,13 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0" jsbn "~0.1.0"
safer-buffer "^2.1.0" safer-buffer "^2.1.0"
echarts@^4.2.0-rc.2:
version "4.2.0-rc.2"
resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.2.0-rc.2.tgz#6a98397aafa81b65cbf0bc15d9afdbfb244df91e"
integrity sha512-5Y4Kyi4eNsRM9Cnl7Q8C6PFVjznBJv1VIiMm/VSQ9zyqeo+ce1695GqUd9v4zfVx+Ow1gnwMJX67h0FNvarScw==
dependencies:
zrender "4.0.5"
editions@^1.3.3: editions@^1.3.3:
version "1.3.4" version "1.3.4"
resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b" resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
...@@ -10296,3 +10304,8 @@ zen-observable@^0.8.0: ...@@ -10296,3 +10304,8 @@ zen-observable@^0.8.0:
version "0.8.11" version "0.8.11"
resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.11.tgz#d3415885eeeb42ee5abb9821c95bb518fcd6d199" resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.11.tgz#d3415885eeeb42ee5abb9821c95bb518fcd6d199"
integrity sha512-N3xXQVr4L61rZvGMpWe8XoCGX8vhU35dPyQ4fm5CY/KDlG0F75un14hjbckPXTDuKUY6V0dqR2giT6xN8Y4GEQ== integrity sha512-N3xXQVr4L61rZvGMpWe8XoCGX8vhU35dPyQ4fm5CY/KDlG0F75un14hjbckPXTDuKUY6V0dqR2giT6xN8Y4GEQ==
zrender@4.0.5:
version "4.0.5"
resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.0.5.tgz#6e8f738971ce2cd624aac82b2156729b1c0e5a82"
integrity sha512-SintgipGEJPT9Sz2ABRoE4ZD7Yzy7oR7j7KP6H+C9FlbHWnLUfGVK7E8UV27pGwlxAMB0EsnrqhXx5XjAfv/KA==
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment