summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2018-01-04 08:44:27 -0500
committerJacob Schatz <jschatz1@gmail.com>2018-01-04 08:44:27 -0500
commite1f0d23c898d9133e36afec868abdcef4fb4e8e8 (patch)
tree64527bc71f803c7fdb58e4c04ccc8ebc53fbc912
parent51562aafc782f7eb65152f0551d9cb41268aeae2 (diff)
downloadgitlab-ce-e1f0d23c898d9133e36afec868abdcef4fb4e8e8.tar.gz
Moves prettier to dev dependencyprettier-fixes
-rw-r--r--package.json2
-rw-r--r--yarn.lock8
2 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json
index 8c3932dccfd..3587b015fb3 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,6 @@
"mousetrap": "^1.4.6",
"name-all-modules-plugin": "^1.0.1",
"pikaday": "^1.6.1",
- "prettier": "^1.9.2",
"prismjs": "^1.6.0",
"raphael": "^2.2.7",
"raven-js": "^3.14.0",
@@ -109,6 +108,7 @@
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.4",
"nodemon": "^1.11.0",
+ "prettier": "1.9.2",
"webpack-dev-server": "^2.6.1"
}
}
diff --git a/yarn.lock b/yarn.lock
index 381b1a243f8..b29fc022bde 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5146,14 +5146,14 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+prettier@1.9.2:
+ version "1.9.2"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.2.tgz#96bc2132f7a32338e6078aeb29727178c6335827"
+
prettier@^1.7.0:
version "1.8.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.2.tgz#bff83e7fd573933c607875e5ba3abbdffb96aeb8"
-prettier@^1.9.2:
- version "1.9.2"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.2.tgz#96bc2132f7a32338e6078aeb29727178c6335827"
-
prismjs@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz#118d95fb7a66dba2272e343b345f5236659db365"