Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 7 deletions

diff --git a/package.json b/package.json
index b3e31bcfee3..85339e7ce73 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,6 @@
     "babel-loader": "^8.2.2",
     "babel-plugin-lodash": "^3.3.4",
     "bootstrap": "4.4.1",
-    "brace-expansion": "^1.1.8",
     "cache-loader": "^4.1.0",
     "clipboard": "^1.7.1",
     "codemirror": "^5.48.4",
@@ -90,15 +89,12 @@
     "exports-loader": "^0.7.0",
     "fast-mersenne-twister": "1.0.2",
     "file-loader": "^5.1.0",
-    "font-awesome": "4.7.0",
     "fuzzaldrin-plus": "^0.6.0",
-    "glob": "^7.1.6",
     "graphql": "^15.4.0",
     "graphql-tag": "^2.11.0",
     "immer": "^7.0.7",
     "ipaddr.js": "^1.9.1",
     "jed": "^1.1.1",
-    "jest-transform-graphql": "^2.1.0",
     "jquery": "^3.5.0",
     "jquery.caret": "^0.3.1",
     "jquery.waitforimages": "^2.2.0",
@@ -112,8 +108,6 @@
     "mathjax": "3",
     "mermaid": "^8.9.0",
     "minimatch": "^3.0.4",
-    "miragejs": "^0.1.40",
-    "mock-apollo-client": "^0.5.0",
     "monaco-editor": "^0.20.0",
     "monaco-editor-webpack-plugin": "^1.9.0",
     "monaco-yaml": "^2.5.1",
@@ -184,6 +178,7 @@
     "istanbul-lib-coverage": "^3.0.0",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-reports": "^3.0.0",
+    "glob": "^7.1.6",
     "jasmine-core": "^2.9.0",
     "jasmine-diff": "^0.1.3",
     "jasmine-jquery": "^2.1.1",
@@ -192,6 +187,7 @@
     "jest-environment-jsdom": "^26.5.2",
     "jest-junit": "^12.0.0",
     "jest-raw-loader": "^1.0.1",
+    "jest-transform-graphql": "^2.1.0",
     "jest-util": "^26.5.2",
     "jsdoc": "^3.5.5",
     "jsdoc-vue": "^1.0.0",
@@ -205,9 +201,10 @@
     "karma-webpack": "^4.0.2",
     "markdownlint-cli": "0.24.0",
     "md5": "^2.2.1",
+    "miragejs": "^0.1.40",
+    "mock-apollo-client": "^0.5.0",
     "node-sass": "^4.14.1",
     "nodemon": "^2.0.4",
-    "pixelmatch": "^4.0.2",
     "postcss": "^7.0.14",
     "prettier": "2.2.1",
     "readdir-enhanced": "^2.2.4",