diff options
| author | Hiroyuki Sato <sathiroyuki@gmail.com> | 2018-11-21 11:58:52 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2018-11-21 11:58:52 +0900 |
| commit | 692f87215df9c2a96c889a00fbb7cf8d459c3595 (patch) | |
| tree | 642e6a6dbc74b58cea5ffa8abddf6ee0ee422470 /package.json | |
| parent | b689b20f20f1a3773ba88cfb2f4d355d90389145 (diff) | |
| parent | 6a31259ccef5106126421ab5a93fd303a9326e4a (diff) | |
| download | gitlab-ce-692f87215df9c2a96c889a00fbb7cf8d459c3595.tar.gz | |
Merge remote-tracking branch 'origin/master' into fix-typos-occured
Conflicts:
- app/assets/javascripts/ide/stores/modules/pipelines/actions.js
- spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index 2d6479fea3f..380f44946dc 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,8 @@ "@babel/plugin-syntax-dynamic-import": "^7.0.0", "@babel/plugin-syntax-import-meta": "^7.0.0", "@babel/preset-env": "^7.1.0", - "@gitlab-org/gitlab-ui": "^1.10.0", - "@gitlab/svgs": "^1.35.0", + "@gitlab/svgs": "^1.38.0", + "@gitlab/ui": "^1.11.0", "autosize": "^4.0.0", "axios": "^0.17.1", "babel-loader": "^8.0.4", @@ -111,7 +111,7 @@ "xterm": "^3.5.0" }, "devDependencies": { - "@gitlab/eslint-config": "^1.1.0", + "@gitlab/eslint-config": "^1.2.0", "axios-mock-adapter": "^1.15.0", "babel-plugin-istanbul": "^5.1.0", "babel-plugin-rewire": "^1.2.0", @@ -139,7 +139,7 @@ "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^4.0.0-beta.0", "nodemon": "^1.18.4", - "prettier": "1.14.3", + "prettier": "1.15.2", "webpack-dev-server": "^3.1.8" } } |