diff options
| author | Lukas 'Eipi' Eipert <leipert@gitlab.com> | 2019-03-28 16:52:20 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-03-28 16:52:20 +0000 |
| commit | 826d4e4d7c4e9c542333a8aaa559ebb75fef0396 (patch) | |
| tree | d1e30ebfb7d6602626f725d80b8fa11a443c40da | |
| parent | a74c3e6c3b418ea585f02ba15af1c7292f895a1a (diff) | |
| download | gitlab-ce-826d4e4d7c4e9c542333a8aaa559ebb75fef0396.tar.gz | |
Merge branch 'master' into 'renovate/gitlab-svgs-1.x'
# Conflicts:
# package.json
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json index cb063c9782c..5cba9923112 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@babel/plugin-syntax-import-meta": "^7.2.0", "@babel/preset-env": "^7.3.1", "@gitlab/csslab": "^1.9.0", - "@gitlab/svgs": "^1.54.0", + "@gitlab/svgs": "^1.55.0", "@gitlab/ui": "^3.0.0", "apollo-boost": "^0.3.1", "apollo-client": "^2.5.1", diff --git a/yarn.lock b/yarn.lock index 2bdbca103b1..6a0d9abcdba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -658,10 +658,10 @@ eslint-plugin-promise "^4.0.1" eslint-plugin-vue "^5.0.0" -"@gitlab/svgs@^1.54.0": - version "1.54.0" - resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.54.0.tgz#00320e845efd46716042cde0c348b990d4908daf" - integrity sha512-DR17iy8TM5IbXEacqiDP0p8SuC/J8EL+98xbfVz5BKvRsPHpeZJQNlBF/petIV5d+KWM5A9v3GZTY7uMU7z/JQ== +"@gitlab/svgs@^1.55.0": + version "1.55.0" + resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.55.0.tgz#8d3f953977caba54aafdbba7f6b0b0eadd7d0bc0" + integrity sha512-Uc9CL6fRRvmsXly+inHJJiThS2zoaVCpM8ufHxWq7NMEFoZhi8MjG8atMGXrfscIxJg24ctEcIVhKTfM7uLssw== "@gitlab/ui@^3.0.0": version "3.0.0" |