summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-01-08 19:19:52 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-01-08 19:19:52 +0000
commite2b759a2f483663e0771180de6b97bb9344a56cd (patch)
tree32cd72a70e405dc0858d774ca3354d6aef1bf445 /package.json
parent7ca5a3f99dd3a3c1800f65da7b4f08395a97395a (diff)
parentdf74461014bbdbc691f4f4039b02962dad292362 (diff)
downloadgitlab-ce-e2b759a2f483663e0771180de6b97bb9344a56cd.tar.gz
Merge branch 'master' into 34312-eslint-vue-plugin
* master: (140 commits) Add Gitter room link to I want to contribute since you always have questions Use workhorse 3.4.0 chore: remove symbolic link Add memoization for properties Resolve "Allow QA tests to run with `CHROME_HEADLESS=false`" Resolve "Add graph value to hover" Fix slash commands dropdown description disables the shortcut to the issue boards when issues are disabled Fix static analysys Disable STI of ActiveRecord. Refactoring specs. Fix StaticSnalysys Fix change log Add changelog Revert bulk_insert and bring back AR insert(one by one) Add a new test for emptified params Use batch update for Service deactivation Fix query to look for proper unmanaged kubernetes service Fix static anylysy Use bulk_insert instead of AR create Opitmize migration process by using both unmanaged_kubernetes_service and kubernetes_service_without_template ...
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index 294c0040dd0..318bdae60c0 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
"worker-loader": "^1.1.0"
},
"devDependencies": {
- "@gitlab-org/gitlab-svgs": "^1.4.0",
+ "@gitlab-org/gitlab-svgs": "^1.5.0",
"babel-plugin-istanbul": "^4.1.5",
"eslint": "3.18.0",
"eslint-config-airbnb-base": "^10.0.1",