Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

6 files changed, 21 insertions, 27 deletions

diff --git a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue
index 8511f9bdb0f..9bd78b7c89e 100644
--- a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue
+++ b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue
@@ -121,20 +121,18 @@ export default {
 </script>
 
 <template>
-  <div>
+  <div class="gl-pt-2">
     <gl-loading-icon v-if="$apollo.queries.pipeline.loading" />
-    <div v-else>
+    <div v-else class="gl-align-items-center gl-display-flex">
       <linked-pipelines-mini-list
         v-if="upstreamPipeline"
-        :triggered-by="[upstreamPipeline]"
+        :triggered-by="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ [
+          upstreamPipeline,
+        ] /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */"
         data-testid="commit-box-mini-graph-upstream"
       />
 
-      <pipeline-mini-graph
-        :stages="formattedStages"
-        class="gl-display-inline"
-        data-testid="commit-box-mini-graph"
-      />
+      <pipeline-mini-graph :stages="formattedStages" data-testid="commit-box-mini-graph" />
 
       <linked-pipelines-mini-list
         v-if="hasDownstream"
diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js
index 3e1c471f015..2bf13941f6f 100644
--- a/app/assets/javascripts/projects/project_new.js
+++ b/app/assets/javascripts/projects/project_new.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
 import { debounce } from 'lodash';
-import DEFAULT_PROJECT_TEMPLATES from 'ee_else_ce/projects/default_project_templates';
+import DEFAULT_PROJECT_TEMPLATES from 'any_else_ce/projects/default_project_templates';
 import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
 import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '../lib/utils/constants';
 import { ENTER_KEY } from '../lib/utils/keys';
@@ -286,9 +286,6 @@ const bindEvents = () => {
   });
 
   $('.js-import-git-toggle-button').on('click', () => {
-    const $projectMirror = $('#project_mirror');
-
-    $projectMirror.attr('disabled', !$projectMirror.attr('disabled'));
     setProjectNamePathHandlers(
       $('.tab-pane.active #project_name'),
       $('.tab-pane.active #project_path'),
diff --git a/app/assets/javascripts/projects/settings/init_access_dropdown.js b/app/assets/javascripts/projects/settings/init_access_dropdown.js
index 11272652b63..941efaef3bc 100644
--- a/app/assets/javascripts/projects/settings/init_access_dropdown.js
+++ b/app/assets/javascripts/projects/settings/init_access_dropdown.js
@@ -4,7 +4,7 @@ import AccessDropdown from './components/access_dropdown.vue';
 
 export const initAccessDropdown = (el, options) => {
   if (!el) {
-    return false;
+    return null;
   }
 
   const { accessLevelsData, accessLevel } = options;
diff --git a/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue b/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue
index d4c97cbf038..9c8de9bef2d 100644
--- a/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue
+++ b/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue
@@ -85,7 +85,7 @@ export default {
       <gl-avatar-labeled
         :src="dropdownItem.avatarUrl"
         :entity-name="dropdownItem.name"
-        :label="dropdownItem.name"
+        :label="dropdownItem.title"
         :size="32"
         :shape="$options.AVATAR_SHAPE_OPTION_RECT"
       />
diff --git a/app/assets/javascripts/projects/settings/topics/queries/project_topics_search.query.graphql b/app/assets/javascripts/projects/settings/topics/queries/project_topics_search.query.graphql
index b193165062a..0c0a874d950 100644
--- a/app/assets/javascripts/projects/settings/topics/queries/project_topics_search.query.graphql
+++ b/app/assets/javascripts/projects/settings/topics/queries/project_topics_search.query.graphql
@@ -3,6 +3,7 @@ query searchProjectTopics($search: String) {
     nodes {
       id
       name
+      title
       avatarUrl
     }
   }
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
index e5ddfe82e3b..8a9a0b541f3 100644
--- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
+++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
@@ -128,7 +128,7 @@ export default {
       this.selectedTemplate = selectedTemplate;
     },
     validateProjectKey() {
-      if (this.projectKey && !new RegExp(/^[a-z0-9_]+$/).test(this.projectKey)) {
+      if (this.projectKey && !/^[a-z0-9_]+$/.test(this.projectKey)) {
         this.projectKeyError = __('Only use lowercase letters, numbers, and underscores.');
         return;
       }
@@ -270,18 +270,16 @@ export default {
           </template>
         </gl-form-group>
 
-        <div class="gl-display-flex gl-justify-content-end">
-          <gl-button
-            variant="success"
-            class="gl-mt-5"
-            data-testid="save_service_desk_settings_button"
-            data-qa-selector="save_service_desk_settings_button"
-            :disabled="isTemplateSaving"
-            @click="onSaveTemplate"
-          >
-            {{ __('Save changes') }}
-          </gl-button>
-        </div>
+        <gl-button
+          variant="confirm"
+          class="gl-mt-5"
+          data-testid="save_service_desk_settings_button"
+          data-qa-selector="save_service_desk_settings_button"
+          :disabled="isTemplateSaving"
+          @click="onSaveTemplate"
+        >
+          {{ __('Save changes') }}
+        </gl-button>
       </div>
     </div>
   </div>