Add latest changes from gitlab-org/gitlab@master

13 files changed, 30 insertions, 60 deletions

diff --git a/app/assets/javascripts/pages/profiles/index.js b/app/assets/javascripts/pages/profiles/index.js
index 883be18b336..d2b00d0ef45 100644
--- a/app/assets/javascripts/pages/profiles/index.js
+++ b/app/assets/javascripts/pages/profiles/index.js
@@ -4,7 +4,7 @@ import Profile from '~/profile/profile';
 
 document.addEventListener('DOMContentLoaded', () => {
   // eslint-disable-next-line func-names
-  $(document).on('input.ssh_key', '#key_key', function() {
+  $(document).on('input.ssh_key', '#key_key', function () {
     const $title = $('#key_title');
     const comment = $(this)
       .val()
diff --git a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue
index 6dd50958fa4..5d3ce30f9d9 100644
--- a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue
+++ b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue
@@ -161,9 +161,7 @@ export default {
           <template #coveragePercentage>
             {{ coveragePercentage }}
           </template>
-          <template #percentSymbol>
-            %
-          </template>
+          <template #percentSymbol> % </template>
         </gl-sprintf>
       </template>
     </gl-area-chart>
diff --git a/app/assets/javascripts/pages/projects/init_form.js b/app/assets/javascripts/pages/projects/init_form.js
index 019efe077f7..9f20a3e4e46 100644
--- a/app/assets/javascripts/pages/projects/init_form.js
+++ b/app/assets/javascripts/pages/projects/init_form.js
@@ -1,7 +1,7 @@
 import ZenMode from '~/zen_mode';
 import GLForm from '~/gl_form';
 
-export default function($formEl) {
+export default function ($formEl) {
   new ZenMode(); // eslint-disable-line no-new
   new GLForm($formEl); // eslint-disable-line no-new
 }
diff --git a/app/assets/javascripts/pages/projects/issues/show.js b/app/assets/javascripts/pages/projects/issues/show.js
index 614f8262e5b..5162023a111 100644
--- a/app/assets/javascripts/pages/projects/issues/show.js
+++ b/app/assets/javascripts/pages/projects/issues/show.js
@@ -16,7 +16,7 @@ import initInviteMemberModal from '~/invite_member/init_invite_member_modal';
 
 import { IssuableType } from '~/issuable_show/constants';
 
-export default function() {
+export default function () {
   const initialDataEl = document.getElementById('js-issuable-app');
   const { issueType, ...issuableData } = parseIssuableData(initialDataEl);
 
diff --git a/app/assets/javascripts/pages/projects/merge_requests/creations/new/compare.js b/app/assets/javascripts/pages/projects/merge_requests/creations/new/compare.js
index 46f3f55a400..4c766f94fba 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/creations/new/compare.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/creations/new/compare.js
@@ -29,9 +29,7 @@ export default mrNewCompareNode => {
       $(mrNewCompareNode).find('.js-source-loading'),
       $(mrNewCompareNode).find('.mr_source_commit'),
       {
-        ref: $(mrNewCompareNode)
-          .find("input[name='merge_request[source_branch]']")
-          .val(),
+        ref: $(mrNewCompareNode).find("input[name='merge_request[source_branch]']").val(),
       },
     );
   const updateTargetBranchCommitList = () =>
@@ -43,9 +41,7 @@ export default mrNewCompareNode => {
         target_project_id: $(mrNewCompareNode)
           .find("input[name='merge_request[target_project_id]']")
           .val(),
-        ref: $(mrNewCompareNode)
-          .find("input[name='merge_request[target_branch]']")
-          .val(),
+        ref: $(mrNewCompareNode).find("input[name='merge_request[target_branch]']").val(),
       },
     );
   initCompareAutocomplete('branches', $dropdown => {
diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
index 0714fc21b17..27e10367a48 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
@@ -8,7 +8,7 @@ import loadAwardsHandler from '~/awards_handler';
 import initInviteMemberTrigger from '~/invite_member/init_invite_member_trigger';
 import initInviteMemberModal from '~/invite_member/init_invite_member_modal';
 
-export default function() {
+export default function () {
   new ZenMode(); // eslint-disable-line no-new
   initIssuableSidebar();
   initPipelines();
diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
index 5ef1f959b2c..aa7414f3ae7 100644
--- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
+++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
@@ -125,7 +125,7 @@ export default {
         :data-testid="option.value"
       >
         <gl-sprintf v-if="option.link" :message="option.text">
-          <template #link="{content}">
+          <template #link="{ content }">
             <gl-link :href="option.link" target="_blank" class="gl-font-sm">
               {{ content }}
             </gl-link>
diff --git a/app/assets/javascripts/pages/projects/project.js b/app/assets/javascripts/pages/projects/project.js
index 8c7aa04a0b6..807063be463 100644
--- a/app/assets/javascripts/pages/projects/project.js
+++ b/app/assets/javascripts/pages/projects/project.js
@@ -18,34 +18,26 @@ export default class Project {
     // Ref switcher
     if (document.querySelector('.js-project-refs-dropdown')) {
       Project.initRefSwitcher();
-      $('.project-refs-select').on('change', function() {
-        return $(this)
-          .parents('form')
-          .trigger('submit');
+      $('.project-refs-select').on('change', function () {
+        return $(this).parents('form').trigger('submit');
       });
     }
 
-    $('.hide-no-ssh-message').on('click', function(e) {
+    $('.hide-no-ssh-message').on('click', function (e) {
       Cookies.set('hide_no_ssh_message', 'false');
-      $(this)
-        .parents('.no-ssh-key-message')
-        .remove();
+      $(this).parents('.no-ssh-key-message').remove();
       return e.preventDefault();
     });
-    $('.hide-no-password-message').on('click', function(e) {
+    $('.hide-no-password-message').on('click', function (e) {
       Cookies.set('hide_no_password_message', 'false');
-      $(this)
-        .parents('.no-password-message')
-        .remove();
+      $(this).parents('.no-password-message').remove();
       return e.preventDefault();
     });
-    $('.hide-auto-devops-implicitly-enabled-banner').on('click', function(e) {
+    $('.hide-auto-devops-implicitly-enabled-banner').on('click', function (e) {
       const projectId = $(this).data('project-id');
       const cookieKey = `hide_auto_devops_implicitly_enabled_banner_${projectId}`;
       Cookies.set(cookieKey, 'false');
-      $(this)
-        .parents('.auto-devops-implicitly-enabled-banner')
-        .remove();
+      $(this).parents('.auto-devops-implicitly-enabled-banner').remove();
       return e.preventDefault();
     });
 
@@ -67,7 +59,7 @@ export default class Project {
 
     refLink.href = '#';
 
-    return $('.js-project-refs-dropdown').each(function() {
+    return $('.js-project-refs-dropdown').each(function () {
       const $dropdown = $(this);
       const selected = $dropdown.data('selected');
       const fieldName = $dropdown.data('fieldName');
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
index 5227964572f..f5a10266ed2 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
@@ -354,18 +354,21 @@ export default {
               <option
                 :value="visibilityOptions.PRIVATE"
                 :disabled="!visibilityAllowed(visibilityOptions.PRIVATE)"
-                >{{ s__('ProjectSettings|Private') }}</option
               >
+                {{ s__('ProjectSettings|Private') }}
+              </option>
               <option
                 :value="visibilityOptions.INTERNAL"
                 :disabled="!visibilityAllowed(visibilityOptions.INTERNAL)"
-                >{{ s__('ProjectSettings|Internal') }}</option
               >
+                {{ s__('ProjectSettings|Internal') }}
+              </option>
               <option
                 :value="visibilityOptions.PUBLIC"
                 :disabled="!visibilityAllowed(visibilityOptions.PUBLIC)"
-                >{{ s__('ProjectSettings|Public') }}</option
               >
+                {{ s__('ProjectSettings|Public') }}
+              </option>
             </select>
             <gl-icon
               name="chevron-down"
diff --git a/app/assets/javascripts/pages/projects/tags/index/index.js b/app/assets/javascripts/pages/projects/tags/index/index.js
index ec56fa3e075..7f85d84a2e8 100644
--- a/app/assets/javascripts/pages/projects/tags/index/index.js
+++ b/app/assets/javascripts/pages/projects/tags/index/index.js
@@ -3,10 +3,7 @@ import { initRemoveTag } from '../remove_tag';
 document.addEventListener('DOMContentLoaded', () => {
   initRemoveTag({
     onDelete: path => {
-      document
-        .querySelector(`[data-path="${path}"]`)
-        .closest('.js-tag-list')
-        .remove();
+      document.querySelector(`[data-path="${path}"]`).closest('.js-tag-list').remove();
     },
   });
 });
diff --git a/app/assets/javascripts/pages/search/show/search.js b/app/assets/javascripts/pages/search/show/search.js
index b411b637f36..cbef5ab1bbc 100644
--- a/app/assets/javascripts/pages/search/show/search.js
+++ b/app/assets/javascripts/pages/search/show/search.js
@@ -16,16 +16,12 @@ export default class Search {
   }
 
   eventListeners() {
-    $(document)
-      .off('keyup', this.searchInput)
-      .on('keyup', this.searchInput, this.searchKeyUp);
+    $(document).off('keyup', this.searchInput).on('keyup', this.searchInput, this.searchKeyUp);
     $(document)
       .off('click', this.searchClear)
       .on('click', this.searchClear, this.clearSearchField.bind(this));
 
-    $('a.js-search-clear')
-      .off('click', this.clearSearchFilter)
-      .on('click', this.clearSearchFilter);
+    $('a.js-search-clear').off('click', this.clearSearchFilter).on('click', this.clearSearchFilter);
   }
 
   static submitSearch() {
@@ -42,10 +38,7 @@ export default class Search {
   }
 
   clearSearchField() {
-    return $(this.searchInput)
-      .val('')
-      .trigger('keyup')
-      .focus();
+    return $(this.searchInput).val('').trigger('keyup').focus();
   }
 
   // We need to manually follow the link on the anchors
diff --git a/app/assets/javascripts/pages/users/activity_calendar.js b/app/assets/javascripts/pages/users/activity_calendar.js
index 54666af540e..1322dd0e4c8 100644
--- a/app/assets/javascripts/pages/users/activity_calendar.js
+++ b/app/assets/javascripts/pages/users/activity_calendar.js
@@ -42,11 +42,7 @@ function formatTooltipText({ date, count }) {
   return `${contribText}<br />${dateDayName} ${dateText}`;
 }
 
-const initColorKey = () =>
-  d3
-    .scaleLinear()
-    .range(['#acd5f2', '#254e77'])
-    .domain([0, 3]);
+const initColorKey = () => d3.scaleLinear().range(['#acd5f2', '#254e77']).domain([0, 3]);
 
 export default class ActivityCalendar {
   constructor(
@@ -291,10 +287,7 @@ export default class ActivityCalendar {
       this.colorKey(2),
       this.colorKey(3),
     ];
-    return d3
-      .scaleThreshold()
-      .domain([0, 10, 20, 30])
-      .range(colorRange);
+    return d3.scaleThreshold().domain([0, 10, 20, 30]).range(colorRange);
   }
 
   clickDay(stamp) {
diff --git a/app/assets/javascripts/pages/users/index.js b/app/assets/javascripts/pages/users/index.js
index 8adbc2a8168..40574785879 100644
--- a/app/assets/javascripts/pages/users/index.js
+++ b/app/assets/javascripts/pages/users/index.js
@@ -11,9 +11,7 @@ function initUserProfile(action) {
   $('.hide-project-limit-message').on('click', e => {
     e.preventDefault();
     Cookies.set('hide_project_limit_message', 'false');
-    $(this)
-      .parents('.project-limit-message')
-      .remove();
+    $(this).parents('.project-limit-message').remove();
   });
 }