diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-02-12 12:48:31 -0600 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-02-12 12:48:31 -0600 |
commit | c833a09d9156e26851746250460ddd2f091e73cd (patch) | |
tree | 01791c2a8461b53c797b3d5b91858f98b07eb477 /package.json | |
parent | 46ae03628de47d1bef2683a3a5fe4963b3df7d52 (diff) | |
parent | 0a22ff267b2d3d787d3da44d927caac7bd442832 (diff) | |
download | gitlab-ce-c833a09d9156e26851746250460ddd2f091e73cd.tar.gz |
Merge branch 'master' into jivl-update-katex
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package.json b/package.json index 19dde7ae27a..f7dac7146b4 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "jed": "^1.1.1", "jquery": "^2.2.4", "jquery-ujs": "1.2.2", + "jquery.waitforimages": "^2.2.0", "js-cookie": "^2.1.3", "jszip": "^3.1.3", "jszip-utils": "^0.0.2", @@ -90,7 +91,7 @@ "worker-loader": "^1.1.0" }, "devDependencies": { - "@gitlab-org/gitlab-svgs": "^1.7.0", + "@gitlab-org/gitlab-svgs": "^1.8.0", "axios-mock-adapter": "^1.10.0", "babel-plugin-istanbul": "^4.1.5", "eslint": "^3.18.0", |