Add latest changes from gitlab-org/gitlab@master

4 files changed, 50 insertions, 1 deletions

diff --git a/app/assets/javascripts/ci/runner/project_runners/index.js b/app/assets/javascripts/ci/runner/project_runners/index.js
new file mode 100644
index 00000000000..3be2b4a7422
--- /dev/null
+++ b/app/assets/javascripts/ci/runner/project_runners/index.js
@@ -0,0 +1,23 @@
+import Vue from 'vue';
+import ProjectRunnersApp from './project_runners_app.vue';
+
+export const initProjectRunners = (selector = '#js-project-runners') => {
+  const el = document.querySelector(selector);
+
+  if (!el) {
+    return null;
+  }
+
+  const { projectFullPath } = el.dataset;
+
+  return new Vue({
+    el,
+    render(h) {
+      return h(ProjectRunnersApp, {
+        props: {
+          projectFullPath,
+        },
+      });
+    },
+  });
+};
diff --git a/app/assets/javascripts/ci/runner/project_runners/project_runners_app.vue b/app/assets/javascripts/ci/runner/project_runners/project_runners_app.vue
new file mode 100644
index 00000000000..c7bf5e521a1
--- /dev/null
+++ b/app/assets/javascripts/ci/runner/project_runners/project_runners_app.vue
@@ -0,0 +1,19 @@
+<script>
+export default {
+  props: {
+    projectFullPath: {
+      required: true,
+      type: String,
+    },
+  },
+};
+</script>
+<template>
+  <div>
+    <!-- 
+      Under development
+      Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/33803
+      Feature rollout: https://gitlab.com/gitlab-org/gitlab/-/issues/386573
+    -->
+  </div>
+</template>
diff --git a/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js b/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js
index 8909ff1f221..10332520af8 100644
--- a/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js
+++ b/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js
@@ -11,6 +11,7 @@ import initSettingsPanels from '~/settings_panels';
 import { initTokenAccess } from '~/token_access';
 import { initCiSecureFiles } from '~/ci_secure_files';
 import initDeployTokens from '~/deploy_tokens';
+import { initProjectRunners } from '~/ci/runner/project_runners';
 
 // Initialize expandable settings panels
 initSettingsPanels();
@@ -37,11 +38,13 @@ document.querySelector('.js-toggle-extra-settings').addEventListener('click', (e
 registrySettingsApp();
 initDeployTokens();
 initDeployFreeze();
-
 initSettingsPipelinesTriggers();
 initArtifactsSettings();
+
+initProjectRunners();
 initSharedRunnersToggle();
 initInstallRunner();
 initRunnerAwsDeployments();
+
 initTokenAccess();
 initCiSecureFiles();
diff --git a/app/assets/javascripts/projects/settings/mount_shared_runners_toggle.js b/app/assets/javascripts/projects/settings/mount_shared_runners_toggle.js
index 5ca864a412b..54120b3525d 100644
--- a/app/assets/javascripts/projects/settings/mount_shared_runners_toggle.js
+++ b/app/assets/javascripts/projects/settings/mount_shared_runners_toggle.js
@@ -4,6 +4,10 @@ import SharedRunnersToggle from '~/projects/settings/components/shared_runners_t
 
 export default (containerId = 'toggle-shared-runners-form') => {
   const containerEl = document.getElementById(containerId);
+  if (!containerEl) {
+    return null;
+  }
+
   const {
     isDisabledAndUnoverridable,
     isEnabled,