summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-03-27 12:43:50 +0000
committerMike Greiling <mike@pixelcog.com>2018-03-27 12:43:50 +0000
commit7c626d2d0d9c919ed2086fdd34e1ad6137b86647 (patch)
tree3db0b0ac5b6c4c6784f613676d579ca2535e34ce /package.json
parenteaf4ff094d95270d7a18b71f7afc2bd60012c8b6 (diff)
parent398c298e7538988c500e990b16376b1392c7a372 (diff)
downloadgitlab-ce-7c626d2d0d9c919ed2086fdd34e1ad6137b86647.tar.gz
Merge branch 'sh-add-fsevents-dev-dependency' into 'master'
Add fsevents as an optional dependency to avoid Webpack killing the CPU Closes #33886 See merge request gitlab-org/gitlab-ce!17971
Diffstat (limited to 'package.json')
-rw-r--r--package.json3
1 files changed, 3 insertions, 0 deletions
diff --git a/package.json b/package.json
index 56fd2575e91..31edc3a8016 100644
--- a/package.json
+++ b/package.json
@@ -121,5 +121,8 @@
"nodemon": "^1.15.1",
"prettier": "1.11.1",
"webpack-dev-server": "^2.11.2"
+ },
+ "optionalDependencies": {
+ "fsevents": "^1.1.3"
}
}