Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/docs.gitlab-ci.yml

@@ -42,7 +42,7 @@ review-docs-cleanup:
 docs-lint links:
   extends:
     - .docs:rules:docs-lint
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-html:alpine-3.16-ruby-2.7.6-0bc327a4
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-html:alpine-3.16-ruby-2.7.7-8ae1f7da
   stage: lint
   needs: []
   script:
@@ -58,7 +58,7 @@ docs-lint links:
 
 .docs-markdown-lint-image:
   # When updating the image version here, update it in /scripts/lint-doc.sh too.
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-markdown:alpine-3.16-vale-2.20.1-markdownlint-0.32.2
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-markdown:alpine-3.16-vale-2.22.0-markdownlint-0.32.2-markdownlint2-0.6.0
 
 docs-lint markdown:
   extends:

.ruby-version

@@ -1 +1 @@
-2.7.7
+3.0.5

app/assets/javascripts/abuse_reports/components/abuse_category_selector.vue

@@ -18,14 +18,17 @@ export default {
     reportAbusePath: {
       default: '',
     },
+  },
+  props: {
     reportedUserId: {
-      default: '',
+      type: Number,
+      required: true,
     },
     reportedFromUrl: {
+      type: String,
+      required: false,
       default: '',
     },
-  },
-  props: {
     showDrawer: {
       type: Boolean,
       required: true,
@@ -39,8 +42,8 @@ export default {
   },
   categoryOptions: [
     { value: 'spam', text: s__("ReportAbuse|They're posting spam.") },
-    { value: 'offensive', text: s__("ReportAbuse|They're being offsensive or abusive.") },
-    { value: 'phishing', text: s__("ReportAbuse|They're phising.") },
+    { value: 'offensive', text: s__("ReportAbuse|They're being offensive or abusive.") },
+    { value: 'phishing', text: s__("ReportAbuse|They're phishing.") },
     { value: 'crypto', text: s__("ReportAbuse|They're crypto mining.") },
     {
       value: 'credentials',
@@ -94,7 +97,7 @@ export default {
           data-testid="input-referer"
         />
 
-        <gl-form-group :label="$options.i18n.label">
+        <gl-form-group :label="$options.i18n.label" label-class="gl-text-black-normal">
           <gl-form-radio-group
             v-model="selected"
             :options="$options.categoryOptions"

app/assets/javascripts/boards/components/sidebar/board_sidebar_title.vue

@@ -1,5 +1,5 @@
 <script>
-import { GlAlert, GlButton, GlForm, GlFormGroup, GlFormInput } from '@gitlab/ui';
+import { GlAlert, GlButton, GlForm, GlFormGroup, GlFormInput, GlLink } from '@gitlab/ui';
 import { mapGetters, mapActions } from 'vuex';
 import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue';
 import { joinPaths } from '~/lib/utils/url_utility';
@@ -13,6 +13,7 @@ export default {
     GlButton,
     GlFormGroup,
     GlFormInput,
+    GlLink,
     BoardEditableItem,
   },
   directives: {
@@ -130,7 +131,11 @@ export default {
     @off-click="handleOffClick"
   >
     <template #title>
-      <span data-testid="item-title">{{ item.title }}</span>
+      <span data-testid="item-title">
+        <gl-link class="gl-reset-color gl-hover-text-blue-800" :href="item.webUrl">
+          {{ item.title }}
+        </gl-link>
+      </span>
     </template>
     <template #collapsed>
       <span class="gl-text-gray-800">{{ item.referencePath }}</span>

app/assets/javascripts/issues/show/components/header_actions.vue

@@ -98,6 +98,12 @@ export default {
     submitAsSpamPath: {
       default: '',
     },
+    reportedUserId: {
+      default: '',
+    },
+    reportedFromUrl: {
+      default: '',
+    },
   },
   data() {
     return {
@@ -369,6 +375,8 @@ export default {
     />
 
     <abuse-category-selector
+      :reported-user-id="reportedUserId"
+      :reported-from-url="reportedFromUrl"
       :show-drawer="isReportAbuseDrawerOpen"
       @close-drawer="toggleReportAbuseDrawer(false)"
     />

app/assets/javascripts/issues/show/index.js

@@ -152,7 +152,7 @@ export function initHeaderActions(store, type = '') {
       projectPath: el.dataset.projectPath,
       projectId: el.dataset.projectId,
       reportAbusePath: el.dataset.reportAbusePath,
-      reportedUserId: el.dataset.reportedUserId,
+      reportedUserId: parseInt(el.dataset.reportedUserId, 10),
       reportedFromUrl: el.dataset.reportedFromUrl,
       submitAsSpamPath: el.dataset.submitAsSpamPath,
     },

app/assets/javascripts/mr_notes/init_notes.js

@@ -23,6 +23,7 @@ export default () => {
   }
 
   const notesFilterProps = getNotesFilterData(el);
+  const notesDataset = el.dataset;
 
   // eslint-disable-next-line no-new
   new Vue({
@@ -32,8 +33,10 @@ export default () => {
       NotesApp,
     },
     store,
+    provide: {
+      reportAbusePath: notesDataset.reportAbusePath,
+    },
     data() {
-      const notesDataset = el.dataset;
       const noteableData = JSON.parse(notesDataset.noteableData);
       noteableData.noteableType = notesDataset.noteableType;
       noteableData.targetType = notesDataset.targetType;

app/assets/javascripts/notes/components/note_actions.vue

@@ -10,6 +10,7 @@ import eventHub from '~/sidebar/event_hub';
 import UserAccessRoleBadge from '~/vue_shared/components/user_access_role_badge.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { splitCamelCase } from '~/lib/utils/text_utility';
+import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_selector.vue';
 import ReplyButton from './note_actions/reply_button.vue';
 import TimelineEventButton from './note_actions/timeline_event_button.vue';
 
@@ -30,6 +31,7 @@ export default {
     GlDropdownItem,
     UserAccessRoleBadge,
     EmojiPicker: () => import('~/emoji/components/picker.vue'),
+    AbuseCategorySelector,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -58,11 +60,6 @@ export default {
       required: false,
       default: '',
     },
-    reportAbusePath: {
-      type: String,
-      required: false,
-      default: null,
-    },
     isAuthor: {
       type: Boolean,
       required: false,
@@ -135,6 +132,11 @@ export default {
       default: '',
     },
   },
+  data() {
+    return {
+      isReportAbuseDrawerOpen: false,
+    };
+  },
   computed: {
     ...mapState(['isPromoteCommentToTimelineEventInProgress']),
     ...mapGetters(['getUserDataByProp', 'getNoteableData', 'canUserAddIncidentTimelineEvents']),
@@ -252,6 +254,9 @@ export default {
         awardName,
       });
     },
+    toggleReportAbuseDrawer(isOpen) {
+      this.isReportAbuseDrawerOpen = isOpen;
+    },
   },
 };
 </script>
@@ -362,7 +367,11 @@ export default {
       />
       <!-- eslint-enable @gitlab/vue-no-data-toggle -->
       <ul class="dropdown-menu more-actions-dropdown dropdown-open-left">
-        <gl-dropdown-item v-if="canReportAsAbuse" :href="reportAbusePath">
+        <gl-dropdown-item
+          v-if="canReportAsAbuse"
+          data-testid="report-abuse-button"
+          @click="toggleReportAbuseDrawer(true)"
+        >
           {{ $options.i18n.reportAbuse }}
         </gl-dropdown-item>
         <gl-dropdown-item
@@ -380,5 +389,12 @@ export default {
         </gl-dropdown-item>
       </ul>
     </div>
+    <abuse-category-selector
+      v-if="canReportAsAbuse"
+      :reported-user-id="authorId"
+      :reported-from-url="noteUrl"
+      :show-drawer="isReportAbuseDrawerOpen"
+      @close-drawer="toggleReportAbuseDrawer(false)"
+    />
   </div>
 </template>

app/assets/javascripts/notes/components/noteable_note.vue

@@ -43,6 +43,11 @@ export default {
     SafeHtml,
   },
   mixins: [noteable, resolvable],
+  inject: {
+    reportAbusePath: {
+      default: '',
+    },
+  },
   props: {
     note: {
       type: Object,
@@ -129,7 +134,7 @@ export default {
       };
     },
     canReportAsAbuse() {
-      return Boolean(this.note.report_abuse_path) && this.author.id !== this.getUserData.id;
+      return Boolean(this.reportAbusePath) && this.author.id !== this.getUserData.id;
     },
     noteAnchorId() {
       return `note_${this.note.id}`;
@@ -488,7 +493,6 @@ export default {
           :can-delete="note.current_user.can_edit"
           :can-report-as-abuse="canReportAsAbuse"
           :can-resolve="canResolve"
-          :report-abuse-path="note.report_abuse_path"
           :resolvable="note.resolvable || note.isDraft"
           :is-resolved="note.resolved || note.resolve_discussion"
           :is-resolving="isResolving"

app/assets/javascripts/notes/index.js

@@ -52,6 +52,7 @@ export default () => {
     store,
     provide: {
       showTimelineViewToggle,
+      reportAbusePath: notesDataset.reportAbusePath,
     },
     data() {
       return {

app/assets/javascripts/packages_and_registries/package_registry/components/functional/delete_package.vue

@@ -0,0 +1,76 @@
+<script>
+import destroyPackagesMutation from '~/packages_and_registries/package_registry/graphql/mutations/destroy_packages.mutation.graphql';
+import { createAlert, VARIANT_SUCCESS, VARIANT_WARNING } from '~/flash';
+
+import {
+  DELETE_PACKAGE_ERROR_MESSAGE,
+  DELETE_PACKAGE_SUCCESS_MESSAGE,
+  DELETE_PACKAGES_ERROR_MESSAGE,
+  DELETE_PACKAGES_SUCCESS_MESSAGE,
+} from '~/packages_and_registries/package_registry/constants';
+
+export default {
+  name: 'DeletePackages',
+  props: {
+    refetchQueries: {
+      type: Array,
+      required: false,
+      default: null,
+    },
+    showSuccessAlert: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  i18n: {
+    errorMessage: DELETE_PACKAGE_ERROR_MESSAGE,
+    errorMessageMultiple: DELETE_PACKAGES_ERROR_MESSAGE,
+    successMessage: DELETE_PACKAGE_SUCCESS_MESSAGE,
+    successMessageMultiple: DELETE_PACKAGES_SUCCESS_MESSAGE,
+  },
+  methods: {
+    async deletePackages(packageEntities) {
+      const isSinglePackage = packageEntities.length === 1;
+      try {
+        this.$emit('start');
+        const ids = packageEntities.map((packageEntity) => packageEntity.id);
+        const { data } = await this.$apollo.mutate({
+          mutation: destroyPackagesMutation,
+          variables: {
+            ids,
+          },
+          awaitRefetchQueries: Boolean(this.refetchQueries),
+          refetchQueries: this.refetchQueries,
+        });
+
+        if (data?.destroyPackages?.errors[0]) {
+          throw data.destroyPackages.errors[0];
+        }
+
+        if (this.showSuccessAlert) {
+          createAlert({
+            message: isSinglePackage
+              ? this.$options.i18n.successMessage
+              : this.$options.i18n.successMessageMultiple,
+            variant: VARIANT_SUCCESS,
+          });
+        }
+      } catch (error) {
+        createAlert({
+          message: isSinglePackage
+            ? this.$options.i18n.errorMessage
+            : this.$options.i18n.errorMessageMultiple,
+          variant: VARIANT_WARNING,
+          captureError: true,
+          error,
+        });
+      }
+      this.$emit('end');
+    },
+  },
+  render() {
+    return this.$scopedSlots.default({ deletePackages: this.deletePackages });
+  },
+};
+</script>