Merge branch 'mg-upgrade-prettier' into 'master'

Upgrade prettier to v1.15.2

See merge request gitlab-org/gitlab-ce!22893

2 files changed, 3 insertions, 11 deletions

diff --git a/app/assets/javascripts/vue_shared/components/project_avatar/default.vue b/app/assets/javascripts/vue_shared/components/project_avatar/default.vue
index 17927fabbcc..b399c232937 100644
--- a/app/assets/javascripts/vue_shared/components/project_avatar/default.vue
+++ b/app/assets/javascripts/vue_shared/components/project_avatar/default.vue
@@ -26,10 +26,7 @@ export default {
 </script>
 
 <template>
-  <span
-    :class="sizeClass"
-    class="avatar-container project-avatar"
-  >
+  <span :class="sizeClass" class="avatar-container project-avatar">
     <project-avatar-image
       v-if="project.avatar_url"
       :link-href="project.path"
@@ -37,11 +34,6 @@ export default {
       :img-alt="project.name"
       :img-size="size"
     />
-    <identicon
-      v-else
-      :entity-id="project.id"
-      :entity-name="project.name"
-      :size-class="sizeClass"
-    />
+    <identicon v-else :entity-id="project.id" :entity-name="project.name" :size-class="sizeClass" />
   </span>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/project_avatar/image.vue b/app/assets/javascripts/vue_shared/components/project_avatar/image.vue
index 1a2fd2ad985..e77b9ddc7ba 100644
--- a/app/assets/javascripts/vue_shared/components/project_avatar/image.vue
+++ b/app/assets/javascripts/vue_shared/components/project_avatar/image.vue
@@ -87,7 +87,7 @@ export default {
     :class="{
       lazy: lazy,
       [avatarSizeClass]: true,
-      [cssClasses]: true
+      [cssClasses]: true,
     }"
     :src="resultantSrcAttribute"
     :width="size"