diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-05-28 20:01:56 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-05-28 20:01:56 +0900 |
| commit | 1d20679e9c8b1ba16bebaf982255946e7207b4d4 (patch) | |
| tree | 128685af66ca56c751b505a8314ca79dd3b54b34 /package.json | |
| parent | 8e92e25b62ca108de775362e6d2981e54535f094 (diff) | |
| parent | 014f5f6a69f63ee42bd94454108268f189b62b18 (diff) | |
| download | gitlab-ce-1d20679e9c8b1ba16bebaf982255946e7207b4d4.tar.gz | |
Merge branch 'master' into per-project-pipeline-iid
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/package.json b/package.json index 59b4988b264..13be495b702 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" }, "dependencies": { - "@gitlab-org/gitlab-svgs": "^1.22.0", + "@gitlab-org/gitlab-svgs": "^1.23.0", "autosize": "^4.0.0", "axios": "^0.17.1", "babel-core": "^6.26.3", @@ -25,8 +25,9 @@ "babel-preset-latest": "^6.24.1", "babel-preset-stage-2": "^6.24.1", "blackst0ne-mermaid": "^7.1.0-fixed", - "bootstrap-sass": "^3.3.6", + "bootstrap": "4.1", "brace-expansion": "^1.1.8", + "cache-loader": "^1.2.2", "chart.js": "1.0.2", "classlist-polyfill": "^1.2.0", "clipboard": "^1.7.1", @@ -65,6 +66,7 @@ "monaco-editor": "0.10.0", "mousetrap": "^1.4.6", "pikaday": "^1.6.1", + "popper.js": "^1.14.3", "prismjs": "^1.6.0", "raphael": "^2.2.7", "raven-js": "^3.22.1", @@ -73,6 +75,7 @@ "select2": "3.5.2-browserify", "sha1": "^1.1.1", "sql.js": "^0.4.0", + "stickyfilljs": "^2.0.5", "style-loader": "^0.21.0", "svg4everybody": "2.1.9", "three": "^0.84.0", @@ -83,7 +86,7 @@ "url-loader": "^1.0.1", "visibilityjs": "^1.2.4", "vue": "^2.5.16", - "vue-loader": "^14.1.1", + "vue-loader": "^15.2.0", "vue-resource": "^1.5.0", "vue-router": "^3.0.1", "vue-template-compiler": "^2.5.16", |