Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/CODEOWNERS

@@ -22,6 +22,7 @@
 /doc/**/*.md
 /doc/**/*.jpg
 /doc/**/*.png
+/doc/**/*.svg
 /data/deprecations/*.yml
 
 ## Technical writing files that do not need `*` rule approval,

GITALY_SERVER_VERSION

@@ -1 +1 @@
-4e8f6c6fd0ce517083a7e4edc961cb31ba16999c
+052c8f3e6471dc2acba91db014d522880f2c3042

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

@@ -11,7 +11,6 @@ export default {
   },
   i18n: {
     label: s__('ReportAbuse|Link to spam'),
-    description: s__('ReportAbuse|URL of this user posting spam'),
     addAnotherText: s__('ReportAbuse|Add another link'),
   },
   props: {
@@ -38,14 +37,11 @@ export default {
     <template v-for="(link, index) in links">
       <div :key="index" class="row">
         <div class="col-lg-8">
-          <gl-form-group class="gl-mt-5">
+          <gl-form-group>
             <template #label>
-              <div class="gl-pb-2">
+              <div>
                 {{ $options.i18n.label }}
               </div>
-              <div class="gl-font-normal">
-                {{ $options.i18n.description }}
-              </div>
             </template>
             <gl-form-input
               v-model.trim="links[index]"

app/assets/javascripts/api.js

@@ -1,6 +1,7 @@
 import { createAlert } from '~/alert';
 import { __ } from '~/locale';
 import { validateAdditionalProperties } from '~/tracking/utils';
+import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import axios from './lib/utils/axios_utils';
 import { joinPaths } from './lib/utils/url_utility';
 
@@ -951,11 +952,15 @@ const Api = {
 
     const { data = {} } = { ...window.gl?.snowplowStandardContext };
     const { project_id, namespace_id } = data;
-    return axios.post(
-      url,
-      { event, project_id, namespace_id, additional_properties: additionalProperties },
-      { headers },
-    );
+    return axios
+      .post(
+        url,
+        { event, project_id, namespace_id, additional_properties: additionalProperties },
+        { headers },
+      )
+      .catch((error) => {
+        Sentry.captureException(error);
+      });
   },
 
   buildUrl(url) {

app/assets/javascripts/badges/components/badge.vue

@@ -1,6 +1,6 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <script>
-import { GlLoadingIcon, GlTooltipDirective, GlIcon, GlButton } from '@gitlab/ui';
+import { GlLoadingIcon, GlTooltipDirective, GlButton, GlButtonGroup } from '@gitlab/ui';
 import { s__ } from '~/locale';
 
 export default {
@@ -11,9 +11,9 @@ export default {
   // eslint-disable-next-line @gitlab/require-i18n-strings
   name: 'Badge',
   components: {
-    GlIcon,
     GlLoadingIcon,
     GlButton,
+    GlButtonGroup,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -94,14 +94,12 @@ export default {
 
     <gl-loading-icon v-show="isLoading" size="sm" :inline="true" />
 
-    <div v-show="hasError" class="btn-group">
-      <div class="btn btn-default btn-sm disabled">
-        <gl-icon :size="16" class="gl-ml-3 gl-mr-3" name="doc-image" />
-      </div>
-      <div class="btn btn-default btn-sm disabled">
-        <span class="gl-ml-3 gl-mr-3">{{ s__('Badges|No badge image') }}</span>
-      </div>
-    </div>
+    <gl-button-group v-show="hasError">
+      <gl-button disabled icon="doc-image" />
+      <gl-button disabled>
+        {{ s__('Badges|No badge image') }}
+      </gl-button>
+    </gl-button-group>
 
     <gl-button
       v-show="hasError"

app/assets/javascripts/diffs/store/actions.js

@@ -430,7 +430,7 @@ export const assignDiscussionsToDiff = (
   const hash = getLocationHash();
 
   discussions
-    .filter((discussion) => discussion.diff_discussion)
+    .filter((discussion) => discussion?.diff_discussion)
     .forEach((discussion) => {
       commit(types.SET_LINE_DISCUSSIONS_FOR_FILE, {
         discussion,

app/assets/javascripts/diffs/stores/legacy_diffs/actions.js

@@ -429,7 +429,7 @@ export function assignDiscussionsToDiff(discussions) {
   const hash = getLocationHash();
 
   targetDiscussions
-    .filter((discussion) => discussion.diff_discussion)
+    .filter((discussion) => discussion?.diff_discussion)
     .forEach((discussion) => {
       this[types.SET_LINE_DISCUSSIONS_FOR_FILE]({
         discussion,

app/assets/javascripts/merge_request_dashboard/components/app.vue

@@ -56,7 +56,12 @@ export default {
           :class="{ 'gl-mb-4': i !== tab.lists.length - 1 }"
         >
           <template #default="{ mergeRequests, count, hasNextPage, loadMore, loading, error }">
-            <collapsible-section :count="count" :loading="loading || error" :title="list.title">
+            <collapsible-section
+              :count="count"
+              :loading="loading || error"
+              :title="list.title"
+              :help-content="list.helpContent"
+            >
               <div>
                 <div class="gl-overflow-x-auto">
                   <table class="gl-w-full">

app/assets/javascripts/merge_request_dashboard/components/collapsible_section.vue

@@ -1,17 +1,25 @@
 <script>
-import { GlButton, GlBadge } from '@gitlab/ui';
+import { GlButton, GlBadge, GlTooltipDirective } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
 
 export default {
   components: {
     GlButton,
     GlBadge,
   },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
   props: {
     title: {
       type: String,
       required: true,
     },
+    helpContent: {
+      type: String,
+      required: false,
+      default: '',
+    },
     count: {
       type: Number,
       required: false,
@@ -81,6 +89,13 @@ export default {
           <gl-badge v-if="!loading || count" class="gl-ml-1" variant="neutral" size="sm">{{
             count
           }}</gl-badge>
+          <gl-button
+            v-gl-tooltip
+            :title="helpContent"
+            icon="information-o"
+            variant="link"
+            class="gl-relative gl-top-2 gl-float-right gl-inline-flex"
+          />
         </h2>
       </header>
       <div v-if="open" data-testid="section-content">

app/assets/javascripts/notes/store/legacy_notes/actions.js

@@ -224,6 +224,8 @@ export function fetchDiscussionsBatch({ path, config, cursor, perPage }) {
 }
 
 export function updateDiscussion(discussion) {
+  if (discussion == null) return null;
+
   this[types.UPDATE_DISCUSSION](discussion);
 
   return utils.findNoteObjectById(this.discussions, discussion.id);