Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

2 files changed, 10 insertions, 12 deletions

diff --git a/app/assets/javascripts/projects/pipelines/charts/index.js b/app/assets/javascripts/projects/pipelines/charts/index.js
index 94d32609e5d..28b77f6defd 100644
--- a/app/assets/javascripts/projects/pipelines/charts/index.js
+++ b/app/assets/javascripts/projects/pipelines/charts/index.js
@@ -11,7 +11,13 @@ const apolloProvider = new VueApollo({
 });
 
 const mountPipelineChartsApp = (el) => {
-  const { projectPath, failedPipelinesLink, coverageChartPath, defaultBranch } = el.dataset;
+  const {
+    projectPath,
+    failedPipelinesLink,
+    coverageChartPath,
+    defaultBranch,
+    testRunsEmptyStateImagePath,
+  } = el.dataset;
 
   const shouldRenderDoraCharts = parseBoolean(el.dataset.shouldRenderDoraCharts);
   const shouldRenderQualitySummary = parseBoolean(el.dataset.shouldRenderQualitySummary);
@@ -30,6 +36,7 @@ const mountPipelineChartsApp = (el) => {
       shouldRenderQualitySummary,
       coverageChartPath,
       defaultBranch,
+      testRunsEmptyStateImagePath,
     },
     render: (createElement) => createElement(ProjectPipelinesCharts, {}),
   });
diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js
index 62e2cec874a..f1b7e3df7d6 100644
--- a/app/assets/javascripts/projects/project_new.js
+++ b/app/assets/javascripts/projects/project_new.js
@@ -120,15 +120,6 @@ const bindHowToImport = () => {
       });
     });
   });
-
-  $('.how_to_import_link').on('click', (e) => {
-    e.preventDefault();
-    $(e.currentTarget).next('.modal').show();
-  });
-
-  $('.modal-header .close').on('click', () => {
-    $('.modal').hide();
-  });
 };
 
 const bindEvents = () => {
@@ -153,8 +144,8 @@ const bindEvents = () => {
 
   bindHowToImport();
 
-  $('.btn_import_gitlab_project').on('click', () => {
-    const importHref = $('a.btn_import_gitlab_project').attr('href');
+  $('.btn_import_gitlab_project').on('click contextmenu', () => {
+    const importHref = $('a.btn_import_gitlab_project').attr('data-href');
     $('.btn_import_gitlab_project').attr(
       'href',
       `${importHref}?namespace_id=${$(