summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-11-07 17:12:37 -0600
committerMike Greiling <mike@pixelcog.com>2018-11-20 09:25:59 -0600
commit29d129d21718f8aa9c7d58a8b403cf91f6d4addd (patch)
treeda3e6fe567b84ebfe172ce28c9af0c12e0428013
parentd179ffc25ceb7ffd9bf241494c03a8d90a0aab58 (diff)
downloadgitlab-ce-29d129d21718f8aa9c7d58a8b403cf91f6d4addd.tar.gz
Upgrade prettier to 1.15.2
-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 ac4b4672c86..7099003cfce 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^4.0.0-beta.0",
"nodemon": "^1.18.4",
- "prettier": "1.14.3",
+ "prettier": "1.15.2",
"webpack-dev-server": "^3.1.8"
}
}
diff --git a/yarn.lock b/yarn.lock
index 3ee1b2525be..a3d22bc4b8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6415,10 +6415,10 @@ prettier@1.13.7:
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
integrity sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==
-prettier@1.14.3:
- version "1.14.3"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"
- integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg==
+prettier@1.15.2:
+ version "1.15.2"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.2.tgz#d31abe22afa4351efa14c7f8b94b58bb7452205e"
+ integrity sha512-YgPLFFA0CdKL4Eg2IHtUSjzj/BWgszDHiNQAe0VAIBse34148whfdzLagRL+QiKS+YfK5ftB6X4v/MBw8yCoug==
prismjs@^1.6.0:
version "1.6.0"