Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/admin/application_settings/deletion_protection/constants.js

@@ -3,7 +3,7 @@ import { __, s__ } from '~/locale';
 export const I18N_DELETION_PROTECTION = {
   label: s__('DeletionSettings|Deletion protection'),
   helpText: s__(
-    'DeletionSettings|Period that deleted groups and projects will remain restorable for. Personal projects are always deleted immediately.',
+    'DeletionSettings|Period that deleted groups and projects will remain restorable for.',
   ),
   learnMore: __('Learn more.'),
   days: __('days'),

app/assets/javascripts/batch_comments/components/submit_dropdown.vue

@@ -219,7 +219,11 @@ export default {
     onBeforeClose({ originalEvent: { target }, preventDefault }) {
       if (
         target &&
-        [document.querySelector('.atwho-container'), document.querySelector('.dz-hidden-input')]
+        [
+          document.querySelector('.atwho-container'),
+          document.querySelector('.dz-hidden-input'),
+          document.querySelector('.comment-templates-modal'),
+        ]
           .filter(Boolean)
           .some((el) => el.contains(target))
       ) {

app/assets/javascripts/merge_request_dashboard/queries/assignee_count.query.graphql

@@ -6,6 +6,7 @@ query requestingReviewCount(
   $mergedAfter: Time
   $or: UnionedMergeRequestFilterInput
   $not: MergeRequestsResolverNegatedParams
+  $ignoredReviewerUsername: String
 ) {
   currentUser {
     id
@@ -17,6 +18,7 @@ query requestingReviewCount(
       mergedAfter: $mergedAfter
       or: $or
       not: $not
+      ignoredReviewerUsername: $ignoredReviewerUsername
     ) {
       count
     }

app/assets/javascripts/packages_and_registries/package_registry/components/details/additional_metadata.vue

@@ -87,9 +87,9 @@ export default {
 
 <template>
   <div>
-    <h3 v-if="isLoading || showMetadata" class="gl-text-lg" data-testid="title">
+    <h2 v-if="isLoading || showMetadata" class="gl-heading-2 gl-mt-5" data-testid="title">
       {{ $options.i18n.componentTitle }}
-    </h3>
+    </h2>
     <gl-alert
       v-if="fetchPackageMetadataError"
       variant="danger"

app/assets/javascripts/packages_and_registries/package_registry/components/details/composer_installation.vue

@@ -1,7 +1,6 @@
 <script>
-import { GlLink, GlSprintf } from '@gitlab/ui';
+import { GlAlert, GlLink, GlSprintf } from '@gitlab/ui';
 import { s__ } from '~/locale';
-import InstallationTitle from '~/packages_and_registries/package_registry/components/details/installation_title.vue';
 import {
   TRACKING_ACTION_COPY_COMPOSER_REGISTRY_INCLUDE_COMMAND,
   TRACKING_ACTION_COPY_COMPOSER_PACKAGE_INCLUDE_COMMAND,
@@ -13,8 +12,8 @@ import CodeInstruction from '~/vue_shared/components/registry/code_instruction.v
 export default {
   name: 'ComposerInstallation',
   components: {
-    InstallationTitle,
     CodeInstruction,
+    GlAlert,
     GlLink,
     GlSprintf,
   },
@@ -34,9 +33,6 @@ export default {
       // eslint-disable-next-line @gitlab/require-i18n-strings
       return `composer req ${[this.packageEntity.name]}:${this.packageEntity.version}`;
     },
-    groupExists() {
-      return this.groupListUrl?.length > 0;
-    },
   },
   i18n: {
     registryInclude: s__('PackageRegistry|Add composer registry'),
@@ -46,6 +42,9 @@ export default {
     infoLine: s__(
       'PackageRegistry|For more information on Composer packages in GitLab, %{linkStart}see the documentation.%{linkEnd}',
     ),
+    noGroupListUrlWarning: s__(
+      'PackageRegistry|Composer packages are installed at the group level, but there is no group associated with this project.',
+    ),
   },
   tracking: {
     TRACKING_ACTION_COPY_COMPOSER_REGISTRY_INCLUDE_COMMAND,
@@ -55,14 +54,16 @@ export default {
   links: {
     COMPOSER_HELP_PATH,
   },
-  installOptions: [{ value: 'composer', label: s__('PackageRegistry|Show Composer commands') }],
 };
 </script>
 
 <template>
-  <div v-if="groupExists" data-testid="root-node">
-    <installation-title package-type="composer" :options="$options.installOptions" />
-
+  <div v-if="!groupListUrl" data-testid="error-root-node">
+    <gl-alert variant="warning" :dismissible="false">
+      {{ $options.i18n.noGroupListUrlWarning }}
+    </gl-alert>
+  </div>
+  <div v-else data-testid="root-node">
     <code-instruction
       :label="$options.i18n.registryInclude"
       :instruction="composerRegistryInclude"

app/assets/javascripts/packages_and_registries/package_registry/components/details/conan_installation.vue

@@ -1,7 +1,6 @@
 <script>
 import { GlLink, GlSprintf } from '@gitlab/ui';
 import { s__ } from '~/locale';
-import InstallationTitle from '~/packages_and_registries/package_registry/components/details/installation_title.vue';
 import {
   TRACKING_ACTION_COPY_CONAN_COMMAND,
   TRACKING_ACTION_COPY_CONAN_SETUP_COMMAND,
@@ -13,7 +12,6 @@ import CodeInstruction from '~/vue_shared/components/registry/code_instruction.v
 export default {
   name: 'ConanInstallation',
   components: {
-    InstallationTitle,
     CodeInstruction,
     GlLink,
     GlSprintf,
@@ -45,14 +43,11 @@ export default {
     TRACKING_LABEL_CODE_INSTRUCTION,
   },
   links: { CONAN_HELP_PATH },
-  installOptions: [{ value: 'conan', label: s__('PackageRegistry|Show Conan commands') }],
 };
 </script>
 
 <template>
   <div>
-    <installation-title package-type="conan" :options="$options.installOptions" />
-
     <code-instruction
       :label="s__('PackageRegistry|Conan Command')"
       :instruction="conanInstallationCommand"
@@ -61,7 +56,7 @@ export default {
       :tracking-label="$options.tracking.TRACKING_LABEL_CODE_INSTRUCTION"
     />
 
-    <h3 class="gl-text-lg">{{ __('Registry setup') }}</h3>
+    <h3 class="gl-heading-3 gl-mt-5">{{ s__('PackageRegistry|Registry setup') }}</h3>
 
     <code-instruction
       :label="s__('PackageRegistry|Add Conan Remote')"

app/assets/javascripts/packages_and_registries/package_registry/components/details/installation_commands.vue

@@ -40,7 +40,7 @@ export default {
 </script>
 
 <template>
-  <div v-if="installationComponent">
+  <div class="gl-mb-5">
     <component :is="installationComponent" :package-entity="packageEntity" />
   </div>
 </template>

app/assets/javascripts/packages_and_registries/package_registry/components/details/installation_method.vue

@@ -0,0 +1,40 @@
+<script>
+import { s__ } from '~/locale';
+import PersistedRadioGroup from '~/vue_shared/components/registry/persisted_radio_group.vue';
+
+export default {
+  name: 'InstallationMethod',
+  components: {
+    PersistedRadioGroup,
+  },
+  props: {
+    packageType: {
+      type: String,
+      required: true,
+    },
+    options: {
+      type: Array,
+      required: true,
+    },
+  },
+  computed: {
+    storageKey() {
+      return `package_${this.packageType}_installation_instructions`;
+    },
+  },
+  i18n: {
+    label: s__('PackageRegistry|Installation Method'),
+  },
+};
+</script>
+
+<template>
+  <div class="gl-mb-5">
+    <persisted-radio-group
+      :storage-key="storageKey"
+      :options="options"
+      :label="$options.i18n.label"
+      @change="$emit('change', $event)"
+    />
+  </div>
+</template>

app/assets/javascripts/packages_and_registries/package_registry/components/details/installation_title.vue

@@ -1,7 +1,8 @@
 <script>
 import { GlLink, GlSprintf } from '@gitlab/ui';
 import { s__ } from '~/locale';
-import InstallationTitle from '~/packages_and_registries/package_registry/components/details/installation_title.vue';
+import InstallationMethod from '~/packages_and_registries/package_registry/components/details/installation_method.vue';
+
 import {
   TRACKING_ACTION_COPY_MAVEN_XML,
   TRACKING_ACTION_COPY_MAVEN_COMMAND,
@@ -20,7 +21,7 @@ import CodeInstruction from '~/vue_shared/components/registry/code_instruction.v
 export default {
   name: 'MavenInstallation',
   components: {
-    InstallationTitle,
+    InstallationMethod,
     CodeInstruction,
     GlLink,
     GlSprintf,
@@ -108,7 +109,7 @@ export default {
       `PackageRegistry|Copy and paste this inside your %{codeStart}pom.xml%{codeEnd} %{codeStart}dependencies%{codeEnd} block.`,
     ),
     setupText: s__(
-      `PackageRegistry|If you haven't already done so, you will need to add the below to your %{codeStart}pom.xml%{codeEnd} file.`,
+      `PackageRegistry|If you haven't already, add the configuration below to your %{codeStart}pom.xml%{codeEnd} file.`,
     ),
     helpText: s__(
       'PackageRegistry|For more information on the Maven registry, %{linkStart}see the documentation%{linkEnd}.',
@@ -137,12 +138,11 @@ export default {
 
 <template>
   <div>
-    <installation-title
+    <installation-method
       package-type="maven"
       :options="$options.installOptions"
       @change="instructionType = $event"
     />
-
     <template v-if="showMaven">
       <p>
         <gl-sprintf :message="$options.i18n.xmlText">
@@ -169,7 +169,7 @@ export default {
         :tracking-label="$options.tracking.TRACKING_LABEL_CODE_INSTRUCTION"
       />
 
-      <h3 class="gl-text-lg">{{ s__('PackageRegistry|Registry setup') }}</h3>
+      <h3 class="gl-heading-3 gl-mt-5">{{ s__('PackageRegistry|Registry setup') }}</h3>
       <p>
         <gl-sprintf :message="$options.i18n.setupText">
           <template #code="{ content }">

app/assets/javascripts/packages_and_registries/package_registry/components/details/maven_installation.vue

@@ -2,7 +2,7 @@
 import { GlLink, GlSprintf, GlFormRadioGroup } from '@gitlab/ui';
 import { s__ } from '~/locale';
 
-import InstallationTitle from '~/packages_and_registries/package_registry/components/details/installation_title.vue';
+import InstallationMethod from '~/packages_and_registries/package_registry/components/details/installation_method.vue';
 import {
   TRACKING_ACTION_COPY_NPM_INSTALL_COMMAND,
   TRACKING_ACTION_COPY_NPM_SETUP_COMMAND,
@@ -21,7 +21,7 @@ import CodeInstruction from '~/vue_shared/components/registry/code_instruction.v
 export default {
   name: 'NpmInstallation',
   components: {
-    InstallationTitle,
+    InstallationMethod,
     CodeInstruction,
     GlLink,
     GlSprintf,
@@ -81,7 +81,7 @@ export default {
         return `echo ${scope}:registry=${npmPathForEndpoint}/ >> .npmrc`;
       }
 
-      return `echo \\"${scope}:registry\\" \\"${npmPathForEndpoint}/\\" >> .yarnrc`;
+      return `echo ${scope}:registry ${npmPathForEndpoint}/ >> .yarnrc`;
     },
   },
   packageManagers: {
@@ -98,11 +98,14 @@ export default {
     helpText: s__(
       'PackageRegistry|You may also need to setup authentication using an auth token. %{linkStart}See the documentation%{linkEnd} to find out more.',
     ),
+    npmInstallCommandLabel: s__('PackageRegistry|npm install command'),
+    yarnInstallCommandLabel: s__('PackageRegistry|Yarn install command'),
+    registrySetupCommand: s__('PackageRegistry|Registry setup command'),
   },
   links: { NPM_HELP_PATH },
   installOptions: [
-    { value: NPM_PACKAGE_MANAGER, label: s__('PackageRegistry|Show NPM commands') },
-    { value: YARN_PACKAGE_MANAGER, label: s__('PackageRegistry|Show Yarn commands') },
+    { value: NPM_PACKAGE_MANAGER, label: s__('PackageRegistry|npm') },
+    { value: YARN_PACKAGE_MANAGER, label: s__('PackageRegistry|Yarn') },
   ],
   packageEndpointTypeOptions: [
     { value: INSTANCE_PACKAGE_ENDPOINT_TYPE, text: s__('PackageRegistry|Instance-level') },
@@ -114,7 +117,7 @@ export default {
 
 <template>
   <div>
-    <installation-title
+    <installation-method
       :package-type="$options.packageManagers.NPM_PACKAGE_MANAGER"
       :options="$options.installOptions"
       @change="instructionType = $event"
@@ -123,6 +126,7 @@ export default {
     <code-instruction
       v-if="showNpm"
       :instruction="npmCommand"
+      :label="$options.i18n.npmInstallCommandLabel"
       :copy-text="s__('PackageRegistry|Copy npm command')"
       :tracking-action="$options.tracking.TRACKING_ACTION_COPY_NPM_INSTALL_COMMAND"
       :tracking-label="$options.tracking.TRACKING_LABEL_CODE_INSTRUCTION"
@@ -131,14 +135,16 @@ export default {
     <code-instruction
       v-else
       :instruction="yarnCommand"
+      :label="$options.i18n.yarnInstallCommandLabel"
       :copy-text="s__('PackageRegistry|Copy yarn command')"
       :tracking-action="$options.tracking.TRACKING_ACTION_COPY_YARN_INSTALL_COMMAND"
       :tracking-label="$options.tracking.TRACKING_LABEL_CODE_INSTRUCTION"
     />
 
-    <h3 class="gl-text-lg">{{ __('Registry setup') }}</h3>
+    <h3 class="gl-heading-3 gl-mt-5">{{ s__('PackageRegistry|Registry setup') }}</h3>
 
     <gl-form-radio-group
+      class="gl-my-5"
       :options="$options.packageEndpointTypeOptions"
       :checked="packageEndpointType"
       @change="packageEndpointType = $event"
@@ -147,6 +153,7 @@ export default {
     <code-instruction
       v-if="showNpm"
       :instruction="npmSetup"
+      :label="$options.i18n.registrySetupCommand"
       :copy-text="s__('PackageRegistry|Copy npm setup command')"
       :tracking-action="$options.tracking.TRACKING_ACTION_COPY_NPM_SETUP_COMMAND"
       :tracking-label="$options.tracking.TRACKING_LABEL_CODE_INSTRUCTION"
@@ -155,6 +162,7 @@ export default {
     <code-instruction
       v-else
       :instruction="yarnSetupCommand"
+      :label="$options.i18n.registrySetupCommand"
       :copy-text="s__('PackageRegistry|Copy yarn setup command')"
       :tracking-action="$options.tracking.TRACKING_ACTION_COPY_YARN_SETUP_COMMAND"
       :tracking-label="$options.tracking.TRACKING_LABEL_CODE_INSTRUCTION"