Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_51323issue_51323

1 files changed, 29 insertions, 15 deletions

diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js
index ebe18b47e4e..998554d1be5 100644
--- a/app/assets/javascripts/projects/project_new.js
+++ b/app/assets/javascripts/projects/project_new.js
@@ -4,8 +4,10 @@ import { slugifyWithHyphens } from '../lib/utils/text_utility';
 
 let hasUserDefinedProjectPath = false;
 
-const deriveProjectPathFromUrl = ($projectImportUrl) => {
-  const $currentProjectPath = $projectImportUrl.parents('.toggle-import-form').find('#project_path');
+const deriveProjectPathFromUrl = $projectImportUrl => {
+  const $currentProjectPath = $projectImportUrl
+    .parents('.toggle-import-form')
+    .find('#project_path');
   if (hasUserDefinedProjectPath) {
     return;
   }
@@ -52,9 +54,11 @@ const bindEvents = () => {
     return;
   }
 
-  $('.how_to_import_link').on('click', (e) => {
+  $('.how_to_import_link').on('click', e => {
     e.preventDefault();
-    $(e.currentTarget).next('.modal').show();
+    $(e.currentTarget)
+      .next('.modal')
+      .show();
   });
 
   $('.modal-header .close').on('click', () => {
@@ -63,15 +67,21 @@ const bindEvents = () => {
 
   $('.btn_import_gitlab_project').on('click', () => {
     const importHref = $('a.btn_import_gitlab_project').attr('href');
-    $('.btn_import_gitlab_project')
-      .attr('href', `${importHref}?namespace_id=${$('#project_namespace_id').val()}&name=${$projectName.val()}&path=${$projectPath.val()}`);
+    $('.btn_import_gitlab_project').attr(
+      'href',
+      `${importHref}?namespace_id=${$(
+        '#project_namespace_id',
+      ).val()}&name=${$projectName.val()}&path=${$projectPath.val()}`,
+    );
   });
 
   if ($pushNewProjectTipTrigger) {
     $pushNewProjectTipTrigger
       .removeAttr('rel')
       .removeAttr('target')
-      .on('click', (e) => { e.preventDefault(); })
+      .on('click', e => {
+        e.preventDefault();
+      })
       .popover({
         title: $pushNewProjectTipTrigger.data('title'),
         placement: 'bottom',
@@ -79,13 +89,15 @@ const bindEvents = () => {
         content: $('.push-new-project-tip-template').html(),
       })
       .on('shown.bs.popover', () => {
-        $(document).on('click.popover touchstart.popover', (event) => {
+        $(document).on('click.popover touchstart.popover', event => {
           if ($(event.target).closest('.popover').length === 0) {
             $pushNewProjectTipTrigger.trigger('click');
           }
         });
 
-        const target = $(`#${$pushNewProjectTipTrigger.attr('aria-describedby')}`).find('.js-select-on-focus');
+        const target = $(`#${$pushNewProjectTipTrigger.attr('aria-describedby')}`).find(
+          '.js-select-on-focus',
+        );
         addSelectOnFocusBehaviour(target);
 
         target.focus();
@@ -117,16 +129,18 @@ const bindEvents = () => {
 
     const selectedTemplate = templates[value];
     $selectedTemplateText.text(selectedTemplate.text);
-    $(selectedTemplate.icon).clone().addClass('d-block').appendTo($selectedIcon);
+    $(selectedTemplate.icon)
+      .clone()
+      .addClass('d-block')
+      .appendTo($selectedIcon);
 
     const $activeTabProjectName = $('.tab-pane.active #project_name');
     const $activeTabProjectPath = $('.tab-pane.active #project_path');
     $activeTabProjectName.focus();
-    $activeTabProjectName
-      .keyup(() => {
-        onProjectNameChange($activeTabProjectName, $activeTabProjectPath);
-        hasUserDefinedProjectPath = $activeTabProjectPath.val().trim().length > 0;
-      });
+    $activeTabProjectName.keyup(() => {
+      onProjectNameChange($activeTabProjectName, $activeTabProjectPath);
+      hasUserDefinedProjectPath = $activeTabProjectPath.val().trim().length > 0;
+    });
   }
 
   $useTemplateBtn.on('change', chooseTemplate);