diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:07:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:07:42 +0000 |
commit | 7b52c7cb634ef7047d30b0337fe477bcdcedf41d (patch) | |
tree | 374ca9e908204488422046f10e340d1500780362 /package.json | |
parent | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (diff) | |
download | gitlab-ce-7b52c7cb634ef7047d30b0337fe477bcdcedf41d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/package.json b/package.json index d001afae755..2d1905ab120 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "private": true, "scripts": { "check-dependencies": "scripts/frontend/check_dependencies.sh", + "block-dependencies": "node scripts/frontend/block_dependencies.js", "clean": "rm -rf public/assets tmp/cache/*-loader", "dev-server": "NODE_OPTIONS=\"--max-old-space-size=3584\" nodemon -w 'config/webpack.config.js' --exec 'webpack-dev-server --config config/webpack.config.js'", "eslint": "eslint --cache --max-warnings 0 --report-unused-disable-directives --ext .js,.vue .", @@ -54,7 +55,6 @@ "babel-loader": "^8.0.6", "babel-plugin-lodash": "^3.3.4", "bootstrap": "4.3.1", - "bootstrap-vue": "2.1.0", "brace-expansion": "^1.1.8", "cache-loader": "^4.1.0", "chart.js": "2.7.2", @@ -202,6 +202,9 @@ "yarn-check-webpack-plugin": "^1.2.0", "yarn-deduplicate": "^1.1.1" }, + "blockedDependencies": { + "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.md#bootstrapvue" + }, "resolutions": { "vue-jest/ts-jest": "24.0.0", "monaco-editor": "0.18.1" |