From 55a5ced463ef8bc465476247cee5cc458a6b2355 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 21 Jun 2019 12:07:35 -0500
Subject: Upgrade prettier to latest (v1.18.2)

Upgrades prettier to the latest version, and auto-corrects files with
yarn prettier-all-save

The diffs all seem to stem from formatting changes in brackets within
template literals. Nothing major.

Relevant changelogs here:

https://prettier.io/blog/2019/04/12/1.17.0.html
https://prettier.io/blog/2019/06/06/1.18.0.html
---
 app/assets/javascripts/gfm_auto_complete.js                     | 4 +---
 app/assets/javascripts/groups_select.js                         | 4 +---
 app/assets/javascripts/ide/stores/modules/commit/actions.js     | 8 ++------
 app/assets/javascripts/jobs/components/environments_block.vue   | 4 +---
 app/assets/javascripts/notes.js                                 | 4 +---
 app/assets/javascripts/pages/profiles/two_factor_auths/index.js | 4 +---
 6 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js
index 0af9aabd8cf..3b73dd83c9f 100644
--- a/app/assets/javascripts/gfm_auto_complete.js
+++ b/app/assets/javascripts/gfm_auto_complete.js
@@ -201,9 +201,7 @@ class GfmAutoComplete {
             const autoCompleteAvatar = m.avatar_url || m.username.charAt(0).toUpperCase();
 
             const rectAvatarClass = m.type === GROUP_TYPE ? 'rect-avatar' : '';
-            const imgAvatar = `<img src="${m.avatar_url}" alt="${
-              m.username
-            }" class="avatar ${rectAvatarClass} avatar-inline center s26"/>`;
+            const imgAvatar = `<img src="${m.avatar_url}" alt="${m.username}" class="avatar ${rectAvatarClass} avatar-inline center s26"/>`;
             const txtAvatar = `<div class="avatar ${rectAvatarClass} center avatar-inline s26">${autoCompleteAvatar}</div>`;
 
             return {
diff --git a/app/assets/javascripts/groups_select.js b/app/assets/javascripts/groups_select.js
index a1263d1cdab..f1cc6756583 100644
--- a/app/assets/javascripts/groups_select.js
+++ b/app/assets/javascripts/groups_select.js
@@ -77,9 +77,7 @@ export default function groupsSelect() {
             }
           },
           formatResult(object) {
-            return `<div class='group-result'> <div class='group-name'>${
-              object.full_name
-            }</div> <div class='group-path'>${object.full_path}</div> </div>`;
+            return `<div class='group-result'> <div class='group-name'>${object.full_name}</div> <div class='group-path'>${object.full_path}</div> </div>`;
           },
           formatSelection(object) {
             return object.full_name;
diff --git a/app/assets/javascripts/ide/stores/modules/commit/actions.js b/app/assets/javascripts/ide/stores/modules/commit/actions.js
index ff1255ce749..01ca6a6b12f 100644
--- a/app/assets/javascripts/ide/stores/modules/commit/actions.js
+++ b/app/assets/javascripts/ide/stores/modules/commit/actions.js
@@ -63,9 +63,7 @@ export const setLastCommitMessage = ({ commit, rootGetters }, data) => {
   const commitMsg = sprintf(
     __('Your changes have been committed. Commit %{commitId} %{commitStats}'),
     {
-      commitId: `<a href="${currentProject.web_url}/commit/${data.short_id}" class="commit-sha">${
-        data.short_id
-      }</a>`,
+      commitId: `<a href="${currentProject.web_url}/commit/${data.short_id}" class="commit-sha">${data.short_id}</a>`,
       commitStats,
     },
     false,
@@ -215,9 +213,7 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo
 
             if (rootGetters.activeFile) {
               router.push(
-                `/project/${rootState.currentProjectId}/blob/${getters.branchName}/-/${
-                  rootGetters.activeFile.path
-                }`,
+                `/project/${rootState.currentProjectId}/blob/${getters.branchName}/-/${rootGetters.activeFile.path}`,
               );
             }
           }
diff --git a/app/assets/javascripts/jobs/components/environments_block.vue b/app/assets/javascripts/jobs/components/environments_block.vue
index f7fbb9503a0..132e50e5715 100644
--- a/app/assets/javascripts/jobs/components/environments_block.vue
+++ b/app/assets/javascripts/jobs/components/environments_block.vue
@@ -86,9 +86,7 @@ export default {
         return sprintf(
           '%{startLink}%{name}%{endLink}',
           {
-            startLink: `<a href="${
-              this.deploymentStatus.environment.environment_path
-            }" class="js-environment-link">`,
+            startLink: `<a href="${this.deploymentStatus.environment.environment_path}" class="js-environment-link">`,
             name: _.escape(this.deploymentStatus.environment.name),
             endLink: '</a>',
           },
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index a7156bd2406..9cc31e26648 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -1284,9 +1284,7 @@ export default class Notes {
 
   putConflictEditWarningInPlace(noteEntity, $note) {
     if ($note.find('.js-conflict-edit-warning').length === 0) {
-      const open_link = `<a href="#note_${
-        noteEntity.id
-      }" target="_blank" rel="noopener noreferrer">`;
+      const open_link = `<a href="#note_${noteEntity.id}" target="_blank" rel="noopener noreferrer">`;
       const $alert = $(`<div class="js-conflict-edit-warning alert alert-danger">
         ${sprintf(
           s__(
diff --git a/app/assets/javascripts/pages/profiles/two_factor_auths/index.js b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js
index 10cd8ecfbc9..820f0f7f12d 100644
--- a/app/assets/javascripts/pages/profiles/two_factor_auths/index.js
+++ b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js
@@ -6,9 +6,7 @@ document.addEventListener('DOMContentLoaded', () => {
   const twoFactorNode = document.querySelector('.js-two-factor-auth');
   const skippable = parseBoolean(twoFactorNode.dataset.twoFactorSkippable);
   if (skippable) {
-    const button = `<a class="btn btn-sm btn-warning float-right" data-method="patch" href="${
-      twoFactorNode.dataset.two_factor_skip_url
-    }">Configure it later</a>`;
+    const button = `<a class="btn btn-sm btn-warning float-right" data-method="patch" href="${twoFactorNode.dataset.two_factor_skip_url}">Configure it later</a>`;
     const flashAlert = document.querySelector('.flash-alert .container-fluid');
     if (flashAlert) flashAlert.insertAdjacentHTML('beforeend', button);
   }
-- 
cgit v1.2.1