diff options
author | Mike Greiling <mike@pixelcog.com> | 2019-08-23 21:03:23 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2019-08-23 21:03:23 +0000 |
commit | 1d462d23a94e6ee8a0151444a01ea5858350886b (patch) | |
tree | a22d98af88f13419b1a2beb9fc033bbb56ae12ef /config/webpack.config.js | |
parent | 278c59421c813fc0eb6ab298012cb212e766daa3 (diff) | |
parent | c96adfcd6c9d303f3f7f86e441e57cb3ce8a286e (diff) | |
download | gitlab-ce-1d462d23a94e6ee8a0151444a01ea5858350886b.tar.gz |
Merge branch '66402-use-visual-review-tools-npm-package' into 'master'
Resolve "Use Visual Review Tools NPM package"
See merge request gitlab-org/gitlab-ce!32159
Diffstat (limited to 'config/webpack.config.js')
-rw-r--r-- | config/webpack.config.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 442b4b4c21e..969a84e85dd 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -298,6 +298,13 @@ module.exports = { from: path.join(ROOT_PATH, 'node_modules/pdfjs-dist/cmaps/'), to: path.join(ROOT_PATH, 'public/assets/webpack/cmaps/'), }, + { + from: path.join( + ROOT_PATH, + 'node_modules/@gitlab/visual-review-tools/dist/visual_review_toolbar.js', + ), + to: path.join(ROOT_PATH, 'public/assets/webpack'), + }, ]), // compression can require a lot of compute time and is disabled in CI |