Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/cng/main.gitlab-ci.yml

@@ -19,6 +19,7 @@ include:
   stage: prepare
   needs:
     # We need this job because we need its `cached-assets-hash.txt` artifact, so that we can pass the assets image tag to the downstream CNG pipeline.
+    # TODO: refactor to pass assets hash as environment variable to not download all of the actual assets needlessly
     - pipeline: $PARENT_PIPELINE_ID
       job: compile-production-assets
   variables:

.gitlab/ci/test-on-cng/main.gitlab-ci.yml

@@ -92,10 +92,16 @@ workflow:
 build-cng-env:
   stage: .pre
   extends: .build-cng-env
+  needs:
+    - pipeline: $PARENT_PIPELINE_ID
+      job: clone-gitlab-repo
+    - pipeline: $PARENT_PIPELINE_ID
+      job: compile-production-assets
   variables:
     CNG_COMMIT_SHA: $GITLAB_CNG_MIRROR_REF
     CNG_ACCESS_TOKEN: $CNG_MIRROR_ACCESS_TOKEN
     CNG_SKIP_REDUNDANT_JOBS: "false"
+    GIT_STRATEGY: none
 
 build-cng:
   stage: .pre

app/assets/javascripts/admin/users/components/user_type/user_type_selector.vue

@@ -1,5 +1,6 @@
 <script>
-import { GlFormRadioGroup, GlFormRadio } from '@gitlab/ui';
+import { GlFormRadioGroup, GlFormRadio, GlCard } from '@gitlab/ui';
+import AdminRoleDropdown from 'ee_component/admin/users/components/user_type/admin_role_dropdown.vue';
 import { s__ } from '~/locale';
 
 export const USER_TYPE_REGULAR = {
@@ -17,10 +18,10 @@ export const USER_TYPE_AUDITOR = {
 // description is set dynamically based on isCurrentUser prop.
 export const USER_TYPE_ADMIN = { value: 'admin', text: s__('AdminUsers|Administrator') };
 
-// This component is rendered inside a HTML form, so it doesn't submit any data directly. It only sets up the input
+// This component is rendered inside an HTML form, so it doesn't submit any data directly. It only sets up the input
 // values so that when the form is submitted, the values selected in this component are submitted as well.
 export default {
-  components: { GlFormRadioGroup, GlFormRadio },
+  components: { GlFormRadioGroup, GlFormRadio, GlCard, AdminRoleDropdown },
   props: {
     userType: {
       type: String,
@@ -34,6 +35,11 @@ export default {
       type: Boolean,
       required: true,
     },
+    adminRoleId: {
+      type: Number,
+      required: false,
+      default: undefined,
+    },
   },
   data() {
     return {
@@ -81,5 +87,9 @@ export default {
         <template #help>{{ item.description }}</template>
       </gl-form-radio>
     </gl-form-radio-group>
+
+    <gl-card class="gl-mb-7 gl-bg-transparent">
+      <admin-role-dropdown :role-id="adminRoleId" />
+    </gl-card>
   </div>
 </template>

app/assets/javascripts/admin/users/user_type_selector.js

@@ -14,18 +14,21 @@ export const initUserTypeSelector = () => {
   const el = document.getElementById('js-user-type');
   if (!el) return null;
 
-  const { userType, isCurrentUser, licenseAllowsAuditorUser } = el.dataset;
+  const { userType, isCurrentUser, licenseAllowsAuditorUser, adminRoleId, manageRolesPath } =
+    el.dataset;
 
   return new Vue({
     el,
     name: 'UserTypeSelectorRoot',
     apolloProvider,
+    provide: { manageRolesPath },
     render(createElement) {
       return createElement(UserTypeSelector, {
         props: {
           userType,
           isCurrentUser: parseBoolean(isCurrentUser),
           licenseAllowsAuditorUser: parseBoolean(licenseAllowsAuditorUser),
+          adminRoleId: Number(adminRoleId) || undefined,
         },
       });
     },

app/assets/javascripts/ci/runner/components/runner_bulk_delete.vue

@@ -176,7 +176,7 @@ export default {
             </template>
           </gl-sprintf>
         </div>
-        <div class="gl-ml-auto">
+        <div class="gl-ml-auto gl-flex gl-gap-3">
           <gl-button data-testid="clear-selection" variant="default" @click="onClearChecked">{{
             s__('Runners|Clear selection')
           }}</gl-button>

app/assets/javascripts/projects/default_project_templates.js

@@ -33,6 +33,10 @@ export default {
     text: s__('ProjectTemplates|Go Micro'),
     icon: '.template-option .icon-gomicro',
   },
+  astro: {
+    text: s__('ProjectTemplates|Pages/Astro'),
+    icon: '.template-option .icon-astro',
+  },
   gatsby: {
     text: s__('ProjectTemplates|Pages/Gatsby'),
     icon: '.template-option .icon-gatsby',
@@ -125,10 +129,6 @@ export default {
     text: s__('ProjectTemplates|Laravel Framework'),
     icon: '.template-option .icon-laravel',
   },
-  astro_tailwind: {
-    text: s__('ProjectTemplates|Astro Tailwind'),
-    icon: '.template-option .icon-gitlab_logo',
-  },
   nist_80053r5: {
     text: s__('ProjectTemplates|NIST 800-53r5'),
     icon: '.template-option .icon-gitlab_logo',

app/assets/javascripts/sidebar/components/labels/labels_select_widget/graphql/group_labels.query.graphql

@@ -3,7 +3,12 @@
 query groupLabels($fullPath: ID!, $searchTerm: String) {
   workspace: group(fullPath: $fullPath) {
     id
-    labels(searchTerm: $searchTerm, onlyGroupLabels: true, includeAncestorGroups: true) {
+    labels(
+      searchIn: TITLE
+      searchTerm: $searchTerm
+      onlyGroupLabels: true
+      includeAncestorGroups: true
+    ) {
       nodes {
         ...Label
       }

app/assets/javascripts/sidebar/components/labels/labels_select_widget/graphql/project_labels.query.graphql

@@ -3,7 +3,7 @@
 query projectLabels($fullPath: ID!, $searchTerm: String) {
   workspace: project(fullPath: $fullPath) {
     id
-    labels(searchTerm: $searchTerm, includeAncestorGroups: true) {
+    labels(searchIn: TITLE, searchTerm: $searchTerm, includeAncestorGroups: true) {
       nodes {
         ...Label
       }

app/assets/javascripts/vue_shared/components/file_row.stories.js

@@ -0,0 +1,59 @@
+import FileRow from './file_row.vue';
+
+export default {
+  component: FileRow,
+  title: 'vue_shared/file_row',
+};
+
+const defaultFile = {
+  name: 'environment.log',
+  type: 'blob',
+};
+
+const defaultArgs = {
+  file: {
+    ...defaultFile,
+  },
+  fileUrl: 'https://project.com/files/file.log',
+  level: 1,
+};
+
+const Template = (args, { argTypes }) => ({
+  components: { FileRow },
+  props: Object.keys(argTypes),
+  template: `<file-row v-bind="$props" />`,
+});
+
+export const Blob = Template.bind({});
+Blob.args = {
+  ...defaultArgs,
+};
+
+export const Loading = Template.bind({});
+Loading.args = {
+  ...defaultArgs,
+  file: {
+    ...defaultFile,
+    loading: true,
+  },
+};
+
+export const Tree = Template.bind({});
+Tree.args = {
+  ...defaultArgs,
+  file: {
+    name: 'files',
+    type: 'tree',
+  },
+};
+
+export const OpenFolder = Template.bind({});
+OpenFolder.args = {
+  ...defaultArgs,
+  file: {
+    name: 'files',
+    type: 'tree',
+    opened: true,
+    active: true,
+  },
+};

app/assets/javascripts/vue_shared/components/input_copy_toggle_visibility/input_copy_toggle_visibility.vue

@@ -3,6 +3,7 @@ import {
   GlFormInputGroup,
   GlFormInput,
   GlFormGroup,
+  GlButtonGroup,
   GlButton,
   GlTooltipDirective,
 } from '@gitlab/ui';
@@ -21,6 +22,7 @@ export default {
     GlFormInputGroup,
     GlFormInput,
     GlFormGroup,
+    GlButtonGroup,
     GlButton,
     ClipboardButton,
   },
@@ -171,6 +173,7 @@ export default {
         :class="formInputClass"
         v-bind="formInputGroupProps"
         :value="value"
+        class="!gl-border !gl-border-r-section"
         @input="handleInput"
         @click="handleClick"
       />
@@ -180,21 +183,23 @@ export default {
         See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88059#note_969812649
        -->
       <template v-if="showToggleVisibilityButton || showCopyButton" #append>
-        <gl-button
-          v-if="showToggleVisibilityButton"
-          v-gl-tooltip.hover="toggleVisibilityLabel"
-          :aria-label="toggleVisibilityLabel"
-          :icon="toggleVisibilityIcon"
-          data-testid="toggle-visibility-button"
-          @click.stop="handleToggleVisibilityButtonClick"
-        />
-        <clipboard-button
-          v-if="showCopyButton"
-          :text="value"
-          :title="copyButtonTitle"
-          data-testid="clipboard-button"
-          @click="handleCopyButtonClick"
-        />
+        <gl-button-group>
+          <gl-button
+            v-if="showToggleVisibilityButton"
+            v-gl-tooltip.hover="toggleVisibilityLabel"
+            :aria-label="toggleVisibilityLabel"
+            :icon="toggleVisibilityIcon"
+            data-testid="toggle-visibility-button"
+            @click.stop="handleToggleVisibilityButtonClick"
+          />
+          <clipboard-button
+            v-if="showCopyButton"
+            :text="value"
+            :title="copyButtonTitle"
+            data-testid="clipboard-button"
+            @click="handleCopyButtonClick"
+          />
+        </gl-button-group>
       </template>
     </gl-form-input-group>
     <!-- eslint-disable-next-line @gitlab/vue-prefer-dollar-scopedslots -->

app/assets/javascripts/work_items/components/create_work_item.vue

@@ -54,7 +54,6 @@ import {
   WIDGET_TYPE_HIERARCHY,
   WORK_ITEM_TYPE_NAME_LOWERCASE_MAP,
   WORK_ITEM_TYPE_NAME_MAP,
-  NAME_TO_ENUM_MAP,
   WORK_ITEM_TYPE_NAME_INCIDENT,
   WORK_ITEM_TYPE_NAME_EPIC,
   WIDGET_TYPE_CUSTOM_FIELDS,
@@ -159,7 +158,7 @@ export default {
       required: false,
       default: '',
     },
-    workItemTypeName: {
+    preselectedWorkItemType: {
       type: String,
       required: false,
       default: null,
@@ -288,7 +287,7 @@ export default {
         }
 
         const selectedWorkItemType = this.workItemTypes?.find(
-          (workItemType) => NAME_TO_ENUM_MAP[workItemType.name] === this.workItemTypeName,
+          (workItemType) => workItemType.name === this.preselectedWorkItemType,
         );
 
         if (selectedWorkItemType) {
@@ -395,12 +394,9 @@ export default {
     selectedWorkItemTypeIconName() {
       return this.selectedWorkItemType?.iconName;
     },
-    selectedWorkItemTypeEnum() {
-      return NAME_TO_ENUM_MAP[this.selectedWorkItemTypeName];
-    },
     formOptions() {
       const options = [...this.workItemTypesForSelect];
-      if (!this.workItemTypeName) {
+      if (!this.preselectedWorkItemType) {
         options.unshift({ value: null, text: s__('WorkItem|Select type') });
       }
       return options;
@@ -625,7 +621,7 @@ export default {
           variables: {
             input: {
               fullPath: this.fullPath,
-              workItemType: this.selectedWorkItemTypeName || this.workItemTypeName,
+              workItemType: this.selectedWorkItemTypeName,
               [type]: value,
             },
           },
@@ -809,8 +805,7 @@ export default {
           numberOfDiscussionsResolved: this.numberOfDiscussionsResolved,
         });
 
-        const workItemTypeName = this.selectedWorkItemTypeName || this.workItemTypeName;
-        const autosaveKey = getNewWorkItemAutoSaveKey(this.fullPath, workItemTypeName);
+        const autosaveKey = getNewWorkItemAutoSaveKey(this.fullPath, this.selectedWorkItemTypeName);
         clearDraft(autosaveKey);
       } catch {
         this.error = this.createErrorText;
@@ -830,8 +825,7 @@ export default {
       }
     },
     handleDiscardDraft() {
-      const workItemTypeName = this.selectedWorkItemTypeName || this.workItemTypeName;
-      const autosaveKey = getNewWorkItemAutoSaveKey(this.fullPath, workItemTypeName);
+      const autosaveKey = getNewWorkItemAutoSaveKey(this.fullPath, this.selectedWorkItemTypeName);
       clearDraft(autosaveKey);
 
       const selectedWorkItemWidgets = this.selectedWorkItemType?.widgetDefinitions || [];
@@ -884,7 +878,7 @@ export default {
             v-model="selectedWorkItemTypeId"
             data-testid="work-item-types-select"
             :options="formOptions"
-            @change="$emit('changeType', selectedWorkItemTypeEnum)"
+            @change="$emit('changeType', selectedWorkItemTypeName)"
           />
         </gl-form-group>
       </div>

app/assets/javascripts/work_items/components/create_work_item_cancel_confirmation_modal.vue

@@ -1,6 +1,7 @@
 <script>
 import { GlButton, GlModal } from '@gitlab/ui';
 import { s__, sprintf } from '~/locale';
+import { WORK_ITEM_TYPE_NAME_LOWERCASE_MAP } from '../constants';
 
 export default {
   components: {
@@ -11,21 +12,17 @@ export default {
     isVisible: {
       type: Boolean,
       required: true,
-      default: false,
     },
-    workItemTypeName: {
+    workItemType: {
       type: String,
       required: true,
-      default: s__('Work Item|Epic'),
     },
   },
   computed: {
     cancelConfirmationText() {
       return sprintf(
         s__('WorkItem|Are you sure you want to cancel creating this %{workItemType}?'),
-        {
-          workItemType: this.workItemTypeName?.toLocaleLowerCase(),
-        },
+        { workItemType: WORK_ITEM_TYPE_NAME_LOWERCASE_MAP[this.workItemType] },
       );
     },
   },