Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue

@@ -104,9 +104,7 @@ export default {
     </div>
 
     <div class="title hide-collapsed">
-      {{
-        sprintf(__('Lock %{issuableDisplayName}'), { issuableDisplayName: issuableDisplayName })
-      }}
+      {{ sprintf(__('Lock %{issuableDisplayName}'), { issuableDisplayName: issuableDisplayName }) }}
       <button
         v-if="isEditable"
         class="float-right lock-edit"

package.json

@@ -164,7 +164,7 @@
     "karma-webpack": "^4.0.0-beta.0",
     "nodemon": "^1.18.4",
     "pixelmatch": "^4.0.2",
-    "prettier": "1.15.3",
+    "prettier": "1.16.1",
     "vue-jest": "^3.0.2",
     "webpack-dev-server": "^3.1.14",
     "yarn-deduplicate": "^1.0.5"

yarn.lock

@@ -7905,10 +7905,10 @@ prettier@1.13.7:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
   integrity sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==
 
-prettier@1.15.3:
-  version "1.15.3"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a"
-  integrity sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==
+prettier@1.16.1:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.1.tgz#534c2c9d7853f8845e5e078384e71973bd74089f"
+  integrity sha512-XXUITwIkGb3CPJ2hforHah/zTINRyie5006Jd2HKy2qz7snEJXl0KLfsJZW/wst9g6R2rFvqba3VpNYdu1hDcA==
 
 pretty-format@^23.6.0:
   version "23.6.0"