Add latest changes from gitlab-org/gitlab@master

8 files changed, 131 insertions, 69 deletions

diff --git a/app/assets/javascripts/api/user_api.js b/app/assets/javascripts/api/user_api.js
index 17ad1a0b31d..c056b42b5b6 100644
--- a/app/assets/javascripts/api/user_api.js
+++ b/app/assets/javascripts/api/user_api.js
@@ -11,6 +11,7 @@ const USER_POST_STATUS_PATH = '/api/:version/user/status';
 const USER_FOLLOW_PATH = '/api/:version/users/:id/follow';
 const USER_UNFOLLOW_PATH = '/api/:version/users/:id/unfollow';
 const USER_FOLLOWERS_PATH = '/api/:version/users/:id/followers';
+const USER_FOLLOWING_PATH = '/api/:version/users/:id/following';
 const USER_ASSOCIATIONS_COUNT_PATH = '/api/:version/users/:id/associations_count';
 
 export function getUsers(query, options) {
@@ -82,6 +83,16 @@ export function getUserFollowers(userId, params) {
   });
 }
 
+export function getUserFollowing(userId, params) {
+  const url = buildApiUrl(USER_FOLLOWING_PATH).replace(':id', encodeURIComponent(userId));
+  return axios.get(url, {
+    params: {
+      per_page: DEFAULT_PER_PAGE,
+      ...params,
+    },
+  });
+}
+
 export function associationsCount(userId) {
   const url = buildApiUrl(USER_ASSOCIATIONS_COUNT_PATH).replace(':id', encodeURIComponent(userId));
   return axios.get(url);
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue
index ba5ffc60917..cff1043c258 100644
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -1,13 +1,6 @@
 <script>
-import {
-  GlTooltipDirective,
-  GlButton,
-  GlButtonGroup,
-  GlDropdown,
-  GlDropdownItem,
-  GlIcon,
-} from '@gitlab/ui';
-import { mapGetters, mapActions } from 'vuex';
+import { GlButton, GlButtonGroup, GlDisclosureDropdown, GlTooltipDirective } from '@gitlab/ui';
+import { mapActions, mapGetters } from 'vuex';
 import { throttle } from 'lodash';
 import { __ } from '~/locale';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
@@ -18,11 +11,9 @@ export default {
     GlTooltip: GlTooltipDirective,
   },
   components: {
+    GlDisclosureDropdown,
     GlButton,
     GlButtonGroup,
-    GlDropdown,
-    GlDropdownItem,
-    GlIcon,
   },
   mixins: [glFeatureFlagsMixin(), discussionNavigation],
   props: {
@@ -56,6 +47,29 @@ export default {
     resolveAllDiscussionsIssuePath() {
       return this.getNoteableData.create_issue_to_resolve_discussions_path;
     },
+    threadOptions() {
+      const options = [
+        {
+          text: this.toggleThreadsLabel,
+          action: this.handleExpandDiscussions,
+          extraAttrs: {
+            'data-testid': 'toggle-all-discussions-btn',
+          },
+        },
+      ];
+
+      if (this.resolveAllDiscussionsIssuePath && !this.allResolved) {
+        options.push({
+          text: __('Resolve all with new issue'),
+          href: this.resolveAllDiscussionsIssuePath,
+          extraAttrs: {
+            'data-testid': 'resolve-all-with-issue-link',
+          },
+        });
+      }
+
+      return options;
+    },
   },
   methods: {
     ...mapActions(['setExpandDiscussions']),
@@ -86,32 +100,25 @@ export default {
     >
       <template v-if="allResolved">
         {{ __('All threads resolved!') }}
-        <gl-dropdown
-          v-gl-tooltip:discussionCounter.hover.bottom
+        <gl-disclosure-dropdown
+          v-gl-tooltip:discussionCounter.hover.top
+          icon="ellipsis_v"
           size="small"
           category="tertiary"
-          right
+          placement="right"
+          no-caret
           :title="__('Thread options')"
           :aria-label="__('Thread options')"
           toggle-class="btn-icon"
           class="gl-pt-0! gl-px-2 gl-h-full gl-ml-2"
-        >
-          <template #button-content>
-            <gl-icon name="ellipsis_v" class="mr-0" />
-          </template>
-          <gl-dropdown-item
-            data-testid="toggle-all-discussions-btn"
-            @click="handleExpandDiscussions"
-          >
-            {{ toggleThreadsLabel }}
-          </gl-dropdown-item>
-        </gl-dropdown>
+          :items="threadOptions"
+        />
       </template>
       <template v-else>
         {{ n__('%d unresolved thread', '%d unresolved threads', unresolvedDiscussionsCount) }}
         <gl-button-group class="gl-ml-3">
           <gl-button
-            v-gl-tooltip:discussionCounter.hover.bottom
+            v-gl-tooltip:discussionCounter.hover.top
             :title="__('Go to previous unresolved thread')"
             :aria-label="__('Go to previous unresolved thread')"
             class="discussion-previous-btn gl-rounded-base! gl-px-2!"
@@ -123,7 +130,7 @@ export default {
             @click="jumpPrevious"
           />
           <gl-button
-            v-gl-tooltip:discussionCounter.hover.bottom
+            v-gl-tooltip:discussionCounter.hover.top
             :title="__('Go to next unresolved thread')"
             :aria-label="__('Go to next unresolved thread')"
             class="discussion-next-btn gl-rounded-base! gl-px-2!"
@@ -134,32 +141,19 @@ export default {
             category="tertiary"
             @click="jumpNext"
           />
-          <gl-dropdown
-            v-gl-tooltip:discussionCounter.hover.bottom
+          <gl-disclosure-dropdown
+            v-gl-tooltip:discussionCounter.hover.top
+            icon="ellipsis_v"
             size="small"
             category="tertiary"
-            right
+            placement="right"
+            no-caret
             :title="__('Thread options')"
             :aria-label="__('Thread options')"
             toggle-class="btn-icon"
             class="gl-pt-0! gl-px-2"
-          >
-            <template #button-content>
-              <gl-icon name="ellipsis_v" class="mr-0" />
-            </template>
-            <gl-dropdown-item
-              data-testid="toggle-all-discussions-btn"
-              @click="handleExpandDiscussions"
-            >
-              {{ toggleThreadsLabel }}
-            </gl-dropdown-item>
-            <gl-dropdown-item
-              v-if="resolveAllDiscussionsIssuePath && !allResolved"
-              :href="resolveAllDiscussionsIssuePath"
-            >
-              {{ __('Resolve all with new issue') }}
-            </gl-dropdown-item>
-          </gl-dropdown>
+            :items="threadOptions"
+          />
         </gl-button-group>
       </template>
     </div>
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue
index 37a6fe75f15..ca2516810cf 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue
@@ -1,7 +1,6 @@
 <script>
 import {
-  GlDropdown,
-  GlDropdownItem,
+  GlDisclosureDropdown,
   GlFormCheckbox,
   GlIcon,
   GlLink,
@@ -25,8 +24,7 @@ import {
 export default {
   name: 'PackageVersionRow',
   components: {
-    GlDropdown,
-    GlDropdownItem,
+    GlDisclosureDropdown,
     GlFormCheckbox,
     GlIcon,
     GlLink,
@@ -61,6 +59,18 @@ export default {
     errorStatusRow() {
       return this.packageEntity?.status === PACKAGE_ERROR_STATUS;
     },
+    dropdownItems() {
+      return [
+        {
+          text: this.$options.i18n.deletePackage,
+          action: () => this.$emit('delete'),
+          extraAttrs: {
+            class: 'gl-text-red-500!',
+            'data-testid': 'action-delete',
+          },
+        },
+      ];
+    },
   },
   i18n: {
     deletePackage: DELETE_PACKAGE_TEXT,
@@ -129,18 +139,15 @@ export default {
     </template>
 
     <template v-if="packageEntity.canDestroy" #right-action>
-      <gl-dropdown
+      <gl-disclosure-dropdown
         data-testid="delete-dropdown"
         icon="ellipsis_v"
-        :text="$options.i18n.moreActions"
-        :text-sr-only="true"
+        :items="dropdownItems"
+        :toggle-text="$options.i18n.moreActions"
         category="tertiary"
+        text-sr-only
         no-caret
-      >
-        <gl-dropdown-item data-testid="action-delete" variant="danger" @click="$emit('delete')">{{
-          $options.i18n.deletePackage
-        }}</gl-dropdown-item>
-      </gl-dropdown>
+      />
     </template>
   </list-item>
 </template>
diff --git a/app/assets/javascripts/profile/components/following_tab.vue b/app/assets/javascripts/profile/components/following_tab.vue
index 8ee878e3dcc..27c16ee5b46 100644
--- a/app/assets/javascripts/profile/components/following_tab.vue
+++ b/app/assets/javascripts/profile/components/following_tab.vue
@@ -1,16 +1,60 @@
 <script>
 import { GlBadge, GlTab } from '@gitlab/ui';
 import { s__ } from '~/locale';
+import { getUserFollowing } from '~/rest_api';
+import { createAlert } from '~/alert';
+import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils';
+import Follow from './follow.vue';
 
 export default {
   i18n: {
     title: s__('UserProfile|Following'),
+    errorMessage: s__(
+      'UserProfile|An error occurred loading the following. Please refresh the page to try again.',
+    ),
   },
   components: {
     GlBadge,
     GlTab,
+    Follow,
+  },
+  inject: ['followeesCount', 'userId'],
+  data() {
+    return {
+      following: [],
+      loading: true,
+      totalItems: 0,
+      page: 1,
+    };
+  },
+  watch: {
+    page: {
+      async handler() {
+        this.loading = true;
+
+        try {
+          const { data: following, headers } = await getUserFollowing(this.userId, {
+            page: this.page,
+          });
+
+          const { total } = parseIntPagination(normalizeHeaders(headers));
+
+          this.following = following;
+          this.totalItems = total;
+        } catch (error) {
+          createAlert({ message: this.$options.i18n.errorMessage, error, captureError: true });
+        } finally {
+          this.loading = false;
+        }
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    onPaginationInput(page) {
+      this.page = page;
+    },
   },
-  inject: ['followeesCount'],
 };
 </script>
 
@@ -20,5 +64,12 @@ export default {
       <span>{{ $options.i18n.title }}</span>
       <gl-badge size="sm" class="gl-ml-2">{{ followeesCount }}</gl-badge>
     </template>
+    <follow
+      :users="following"
+      :loading="loading"
+      :page="page"
+      :total-items="totalItems"
+      @pagination-input="onPaginationInput"
+    />
   </gl-tab>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index 52cdafd4717..083ce4f87af 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -511,13 +511,13 @@ export default {
   },
   i18n: {
     mergeCommitTemplateHintText: s__(
-      'mrWidget|To change this default message, edit the template for merge commit messages. %{linkStart}Learn more.%{linkEnd}',
+      'mrWidget|To change this default message, edit the template for merge commit messages. %{linkStart}Learn more%{linkEnd}.',
     ),
     squashCommitTemplateHintText: s__(
-      'mrWidget|To change this default message, edit the template for squash commit messages. %{linkStart}Learn more.%{linkEnd}',
+      'mrWidget|To change this default message, edit the template for squash commit messages. %{linkStart}Learn more%{linkEnd}.',
     ),
     mergeAndSquashCommitTemplatesHintText: s__(
-      'mrWidget|To change these default messages, edit the templates for both the merge and squash commit messages. %{linkStart}Learn more.%{linkEnd}',
+      'mrWidget|To change these default messages, edit the templates for both the merge and squash commit messages. %{linkStart}Learn more%{linkEnd}.',
     ),
     sourceDivergedFromTargetText: s__('mrWidget|The source branch is %{link} the target branch'),
     divergedCommits: (count) => n__('%d commit behind', '%d commits behind', count),
@@ -619,9 +619,8 @@ export default {
                             :href="commitTemplateHelpPage"
                             class="inline-link"
                             target="_blank"
+                            >{{ content }}</gl-link
                           >
-                            {{ content }}
-                          </gl-link>
                         </template>
                       </gl-sprintf>
                     </p>
diff --git a/app/models/ci/build_trace_chunk.rb b/app/models/ci/build_trace_chunk.rb
index 03b59b19ef1..e90c480a8cb 100644
--- a/app/models/ci/build_trace_chunk.rb
+++ b/app/models/ci/build_trace_chunk.rb
@@ -242,7 +242,7 @@ module Ci
       ##
       # We need to so persist data then save a new store identifier before we
       # remove data from the previous store to make this operation
-      # trasnaction-safe. `unsafe_set_data! calls `save!` because of this
+      # transaction-safe. `unsafe_set_data! calls `save!` because of this
       # reason.
       #
       # TODO consider using callbacks and state machine to remove old data
diff --git a/app/models/clusters/concerns/prometheus_client.rb b/app/models/clusters/concerns/prometheus_client.rb
index 10cb307addd..d2f69b813aa 100644
--- a/app/models/clusters/concerns/prometheus_client.rb
+++ b/app/models/clusters/concerns/prometheus_client.rb
@@ -29,7 +29,7 @@ module Clusters
         rescue Kubeclient::HttpError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::ENETUNREACH
           # If users have mistakenly set parameters or removed the depended clusters,
           # `proxy_url` could raise an exception because gitlab can not communicate with the cluster.
-          # Since `PrometheusAdapter#can_query?` is eargely loaded on environement pages in gitlab,
+          # Since `PrometheusAdapter#can_query?` is eargely loaded on environment pages in gitlab,
           # we need to silence the exceptions
         end
 
diff --git a/app/models/note.rb b/app/models/note.rb
index 09ff7ad3979..2ac40357625 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -756,7 +756,7 @@ class Note < ApplicationRecord
     Ability.users_that_can_read_internal_notes(users, resource_parent).pluck(:id)
   end
 
-  # Method necesary while we transition into the new format for task system notes
+  # Method necessary while we transition into the new format for task system notes
   # TODO: https://gitlab.com/gitlab-org/gitlab/-/issues/369923
   def note
     return super unless system? && for_issue? && super&.match?(ISSUE_TASK_SYSTEM_NOTE_PATTERN)