.rubocop_todo/capybara/testid_finders.yml

----
-Capybara/TestidFinders:
-  Exclude:
-    - 'spec/features/projects/settings/registry_settings_cleanup_tags_spec.rb'
-    - 'spec/features/projects/settings/registry_settings_spec.rb'
-    - 'spec/features/search/user_searches_for_code_spec.rb'
-    - 'spec/features/search/user_searches_for_issues_spec.rb'
-    - 'spec/features/search/user_searches_for_merge_requests_spec.rb'
-    - 'spec/features/search/user_searches_for_milestones_spec.rb'
-    - 'spec/features/search/user_searches_for_wiki_pages_spec.rb'
-    - 'spec/features/search/user_uses_search_filters_spec.rb'
-    - 'spec/features/tags/developer_deletes_tag_spec.rb'
-    - 'spec/features/tags/maintainer_deletes_protected_tag_spec.rb'
-    - 'spec/features/triggers_spec.rb'
-    - 'spec/features/user_sees_revert_modal_spec.rb'

Gemfile

@@ -137,7 +137,7 @@ gem 'grape', '~> 2.0.0', feature_category: :api
 gem 'grape-entity', '~> 0.10.0', feature_category: :api
 gem 'grape-swagger', '~> 2.0.1', group: [:development, :test], feature_category: :api
 gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api
-gem 'grape-path-helpers', '~> 2.0.0', feature_category: :api
+gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
 gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # GraphQL API
@@ -412,11 +412,11 @@ group :development do
 
   gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
 
-  gem 'ruby-lsp', "~> 0.13.3", require: false, feature_category: :tooling
+  gem 'ruby-lsp', "~> 0.14.2", require: false, feature_category: :tooling
 
-  gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling
+  gem 'ruby-lsp-rails', "~> 0.3.0", feature_category: :tooling
 
-  gem 'ruby-lsp-rspec', "~> 0.1.8", require: false, feature_category: :tooling
+  gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling
 end
 
 group :development, :test do
@@ -577,7 +577,7 @@ gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared
 
 # Structured logging
 gem 'lograge', '~> 0.5' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'grape_logging', '~> 1.8', feature_category: :api
+gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api
 
 # DNS Lookup
 gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory

Gemfile.checksum

@@ -470,7 +470,7 @@
 {"name":"premailer","version":"1.16.0","platform":"ruby","checksum":"03e4402c448e6bae13fb5f6301a8bde4f3508e1bff90ae7c0972c7be94694786"},
 {"name":"premailer-rails","version":"1.10.3","platform":"ruby","checksum":"7cdcb97027866f7a81c490c6d15ada7f39666b5f6375f0821b7e97e0483b112f"},
 {"name":"prime","version":"0.1.2","platform":"ruby","checksum":"d4e956cadfaf04de036dc7dc74f95bf6a285a62cc509b28b7a66b245d19fe3a4"},
-{"name":"prism","version":"0.19.0","platform":"ruby","checksum":"47f17ea8c0b35d051de183608f9bb7e29fa0ced37f3fcc5550542896734c3b62"},
+{"name":"prism","version":"0.24.0","platform":"ruby","checksum":"5122f9a2259dc845804044ca081066d8927c05279c947cc1854b16909e7dfd5d"},
 {"name":"proc_to_ast","version":"0.1.0","platform":"ruby","checksum":"92a73fa66e2250a83f8589f818b0751bcf227c68f85916202df7af85082f8691"},
 {"name":"prometheus-client-mmap","version":"1.1.1","platform":"aarch64-linux","checksum":"35fd23296854a1888c58198cc5776a99e5f5a729bc4262327cd1c44219e7dda2"},
 {"name":"prometheus-client-mmap","version":"1.1.1","platform":"arm64-darwin","checksum":"1fc09a3f76cb3c69fde085dc63a986524e2606b2e36cc64122b49836ee6b1779"},
@@ -572,9 +572,9 @@
 {"name":"rubocop-rails","version":"2.22.1","platform":"ruby","checksum":"db673cdb6321d8bb7627cd6cfb2cb36114acaa0e89581e4694b7304ce2acbd46"},
 {"name":"rubocop-rspec","version":"2.25.0","platform":"ruby","checksum":"083f8a0481dbb9969b2a9eae85670a454fe91d46812e6ec97b34e7f6227b99f3"},
 {"name":"ruby-fogbugz","version":"0.3.0","platform":"ruby","checksum":"5e04cde474648f498a71cf1e1a7ab42c66b953862fbe224f793ec0a7a1d5f657"},
-{"name":"ruby-lsp","version":"0.13.3","platform":"ruby","checksum":"683ddcb2830874074812d3f8ef9d3a6ca03ee37c726b37eb409a401eda912a2d"},
-{"name":"ruby-lsp-rails","version":"0.2.8","platform":"ruby","checksum":"1730cafa65c04c9bc3b6e28b3454afb561ae71859be1f26f36b065975a5a57c8"},
-{"name":"ruby-lsp-rspec","version":"0.1.8","platform":"ruby","checksum":"21db2255bad7ecf7297945c453d8e84af167d01776853f47aacb3bb50caa0ea3"},
+{"name":"ruby-lsp","version":"0.14.2","platform":"ruby","checksum":"d51b94c1cbd4158c84a2f99b8d397ae6051595a548c1c117d5224478a5743132"},
+{"name":"ruby-lsp-rails","version":"0.3.0","platform":"ruby","checksum":"5e4a548d9c47122b10cdfc797f3d9d6ec4051b12c8cc5e099f27a93a5fdba976"},
+{"name":"ruby-lsp-rspec","version":"0.1.10","platform":"ruby","checksum":"71b638b46b08bfda425477aff705bcc0f48d703983afd1fde50e7b43425afd5a"},
 {"name":"ruby-magic","version":"0.6.0","platform":"ruby","checksum":"7b2138877b7d23aff812c95564eba6473b74b815ef85beb0eb792e729a2b6101"},
 {"name":"ruby-openai","version":"3.7.0","platform":"ruby","checksum":"fb735d4c055e282ade264cab9864944c05a8a10e0cddd45a0551e8a9851b1850"},
 {"name":"ruby-progressbar","version":"1.11.0","platform":"ruby","checksum":"cc127db3866dc414ffccbf92928a241e585b3aa2b758a5563e74a6ee0f57d50a"},
@@ -619,7 +619,7 @@
 {"name":"snaky_hash","version":"2.0.0","platform":"ruby","checksum":"fe8b2e39e8ff69320f7812af73ea06401579e29ff1734a7009567391600687de"},
 {"name":"snowplow-tracker","version":"0.8.0","platform":"ruby","checksum":"7ba6f4f1443a829845fd28e63eda72d9d3d247f485310ddcccaebbc52b734a38"},
 {"name":"solargraph","version":"0.47.2","platform":"ruby","checksum":"87ca4b799b9155c2c31c15954c483e952fdacd800f52d6709b901dd447bcac6a"},
-{"name":"sorbet-runtime","version":"0.5.11144","platform":"ruby","checksum":"cb36dfc4ede6d206fa6f7587d4be7c8b4fcd3cc9fd5792614fb9b6c7030548a0"},
+{"name":"sorbet-runtime","version":"0.5.11266","platform":"ruby","checksum":"deb2c3054811fbcce0a888682d820f691895b84e3d8ac7bc7959e988ca0c58bb"},
 {"name":"spamcheck","version":"1.3.0","platform":"ruby","checksum":"a46082752257838d8484c844736e309ec499f85dcc51283a5f973b33f1c994f5"},
 {"name":"spring","version":"4.1.0","platform":"ruby","checksum":"f17f080fb0df558d663c897a6229ed3d5cc54819ab51876ea6eef49a67f0a3cb"},
 {"name":"spring-commands-rspec","version":"1.0.4","platform":"ruby","checksum":"6202e54fa4767452e3641461a83347645af478bf45dddcca9737b43af0dd1a2c"},

Gemfile.lock

@@ -1285,7 +1285,7 @@ GEM
     prime (0.1.2)
       forwardable
       singleton
-    prism (0.19.0)
+    prism (0.24.0)
     proc_to_ast (0.1.0)
       coderay
       parser
@@ -1505,18 +1505,18 @@ GEM
     ruby-fogbugz (0.3.0)
       crack (~> 0.4)
       multipart-post (~> 2.0)
-    ruby-lsp (0.13.3)
+    ruby-lsp (0.14.2)
       language_server-protocol (~> 3.17.0)
-      prism (>= 0.19.0, < 0.20)
-      sorbet-runtime (>= 0.5.5685)
-    ruby-lsp-rails (0.2.8)
+      prism (>= 0.22.0, < 0.25)
+      sorbet-runtime (>= 0.5.10782)
+    ruby-lsp-rails (0.3.0)
       actionpack (>= 6.0)
       activerecord (>= 6.0)
       railties (>= 6.0)
-      ruby-lsp (>= 0.13.0, < 0.14.0)
+      ruby-lsp (>= 0.14.0, < 0.15.0)
       sorbet-runtime (>= 0.5.9897)
-    ruby-lsp-rspec (0.1.8)
-      ruby-lsp (~> 0.13.0)
+    ruby-lsp-rspec (0.1.10)
+      ruby-lsp (~> 0.14.0)
     ruby-magic (0.6.0)
       mini_portile2 (~> 2.8)
     ruby-openai (3.7.0)
@@ -1622,7 +1622,7 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    sorbet-runtime (0.5.11144)
+    sorbet-runtime (0.5.11266)
     spamcheck (1.3.0)
       grpc (~> 1.0)
     spring (4.1.0)
@@ -1955,10 +1955,10 @@ DEPENDENCIES
   gpgme (~> 2.0.23)
   grape (~> 2.0.0)
   grape-entity (~> 0.10.0)
-  grape-path-helpers (~> 2.0.0)
+  grape-path-helpers (~> 2.0.1)
   grape-swagger (~> 2.0.1)
   grape-swagger-entity (~> 0.5.1)
-  grape_logging (~> 1.8)
+  grape_logging (~> 1.8, >= 1.8.4)
   graphiql-rails (~> 1.8.0)
   graphlient (~> 0.6.0)
   graphlyte (~> 1.0.0)
@@ -2086,9 +2086,9 @@ DEPENDENCIES
   rspec_profiling (~> 0.0.6)
   rubocop
   ruby-fogbugz (~> 0.3.0)
-  ruby-lsp (~> 0.13.3)
-  ruby-lsp-rails (~> 0.2.8)
-  ruby-lsp-rspec (~> 0.1.8)
+  ruby-lsp (~> 0.14.2)
+  ruby-lsp-rails (~> 0.3.0)
+  ruby-lsp-rspec (~> 0.1.10)
   ruby-magic (~> 0.6)
   ruby-openai (~> 3.7)
   ruby-progressbar (~> 1.10)

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

 <script>
-import {
-  GlDisclosureDropdown,
-  GlButton,
-  GlIcon,
-  GlForm,
-  GlFormCheckbox,
-  GlFormRadioGroup,
-} from '@gitlab/ui';
+import { GlDisclosureDropdown, GlButton, GlIcon, GlForm, GlFormRadioGroup } from '@gitlab/ui';
 // eslint-disable-next-line no-restricted-imports
 import { mapGetters, mapActions, mapState } from 'vuex';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { __ } from '~/locale';
 import { createAlert } from '~/alert';
 import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
@@ -43,13 +35,11 @@ export default {
     GlIcon,
     GlForm,
     GlFormRadioGroup,
-    GlFormCheckbox,
     MarkdownEditor,
     ApprovalPassword: () => import('ee_component/batch_comments/components/approval_password.vue'),
     SummarizeMyReview: () =>
       import('ee_component/batch_comments/components/summarize_my_review.vue'),
   },
-  mixins: [glFeatureFlagsMixin()],
   inject: {
     canSummarize: { default: false },
   },
@@ -252,21 +242,11 @@ export default {
           />
         </div>
         <gl-form-radio-group
-          v-if="glFeatures.mrRequestChanges"
           v-model="noteData.reviewer_state"
           :options="radioGroupOptions"
           class="gl-mt-4"
           data-testid="reviewer_states"
         />
-        <template v-else-if="userPermissions.canApprove">
-          <gl-form-checkbox
-            v-model="noteData.approve"
-            data-testid="approve_merge_request"
-            class="gl-mt-4"
-          >
-            {{ __('Approve merge request') }}
-          </gl-form-checkbox>
-        </template>
         <approval-password
           v-if="userPermissions.canApprove && getNoteableData.require_password_to_approve"
           v-show="noteData.approve || noteData.reviewer_state === 'approved'"

app/assets/javascripts/gfm_auto_complete.js

@@ -277,8 +277,6 @@ class GfmAutoComplete {
 
   // eslint-disable-next-line class-methods-use-this
   setSubmitReviewStates($input) {
-    if (!window.gon.features?.mrRequestChanges) return;
-
     const REVIEW_STATES = {
       reviewed: {
         header: __('Comment'),

app/assets/javascripts/graphql_shared/queries/project_autocomplete_users.query.graphql → app/assets/javascripts/graphql_shared/queries/workspace_autocomplete_users.query.graphql

 #import "../fragments/user.fragment.graphql"
 #import "~/graphql_shared/fragments/user_availability.fragment.graphql"
 
-query projectAutocompleteUsersSearch($search: String!, $fullPath: ID!) {
+query workspaceAutocompleteUsersSearch(
+  $search: String!
+  $fullPath: ID!
+  $isProject: Boolean = true
+) {
+  groupWorkspace: group(fullPath: $fullPath) @skip(if: $isProject) {
+    id
+    users: autocompleteUsers(search: $search) {
+      ...User
+      ...UserAvailability
+    }
+  }
   workspace: project(fullPath: $fullPath) {
     id
     users: autocompleteUsers(search: $search) {

app/assets/javascripts/issues/list/utils.js

@@ -87,7 +87,8 @@ export const getSortOptions = ({
   hasBlockedIssuesFeature,
   hasIssuableHealthStatusFeature,
   hasIssueWeightsFeature,
-}) => {
+  hasManualSort = true,
+} = {}) => {
   const sortOptions = [
     {
       id: 1,
@@ -153,7 +154,7 @@ export const getSortOptions = ({
         descending: LABEL_PRIORITY_DESC,
       },
     },
-    {
+    hasManualSort && {
       id: 9,
       title: __('Manual'),
       sortDirection: {
@@ -204,7 +205,7 @@ export const getSortOptions = ({
     });
   }
 
-  return sortOptions;
+  return sortOptions.filter((x) => x);
 };
 
 const tokenTypes = Object.keys(filtersMap);

app/assets/javascripts/merge_requests/list/components/merge_request_statistics.vue

+<script>
+import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
+import { i18n } from '../constants';
+
+export default {
+  i18n,
+  components: {
+    GlIcon,
+  },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
+  props: {
+    mergeRequest: {
+      type: Object,
+      required: true,
+    },
+  },
+};
+</script>
+
+<template>
+  <ul class="gl-display-contents">
+    <li
+      v-if="mergeRequest.upvotes"
+      v-gl-tooltip
+      class="gl-display-none gl-sm-display-block gl-mr-3"
+      :title="$options.i18n.upvotes"
+      data-testid="issuable-upvotes"
+    >
+      <gl-icon name="thumb-up" />
+      {{ mergeRequest.upvotes }}
+    </li>
+    <li
+      v-if="mergeRequest.downvotes"
+      v-gl-tooltip
+      class="gl-display-none gl-sm-display-block gl-mr-3"
+      :title="$options.i18n.downvotes"
+      data-testid="issuable-downvotes"
+    >
+      <gl-icon name="thumb-down" />
+      {{ mergeRequest.downvotes }}
+    </li>
+  </ul>
+</template>

app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue

+<script>
+import { isEmpty } from 'lodash';
+import * as Sentry from '~/sentry/sentry_browser_wrapper';
+import { STATUS_ALL, STATUS_CLOSED, STATUS_OPEN, STATUS_MERGED } from '~/issues/constants';
+import { fetchPolicies } from '~/lib/graphql';
+import { isPositiveInteger } from '~/lib/utils/number_utils';
+import { scrollUp } from '~/lib/utils/scroll_utils';
+import { getParameterByName } from '~/lib/utils/url_utility';
+import IssuableList from '~/vue_shared/issuable/list/components/issuable_list_root.vue';
+import { DEFAULT_PAGE_SIZE, mergeRequestListTabs } from '~/vue_shared/issuable/list/constants';
+import {
+  convertToApiParams,
+  convertToSearchQuery,
+  convertToUrlParams,
+  getFilterTokens,
+  getInitialPageParams,
+  getSortKey,
+  getSortOptions,
+  isSortKey,
+} from '~/issues/list/utils';
+import {
+  CREATED_DESC,
+  PARAM_FIRST_PAGE_SIZE,
+  PARAM_LAST_PAGE_SIZE,
+  PARAM_PAGE_AFTER,
+  PARAM_PAGE_BEFORE,
+  PARAM_STATE,
+  UPDATED_DESC,
+  urlSortParams,
+} from '~/issues/list/constants';
+import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
+import setSortPreferenceMutation from '~/issues/list/queries/set_sort_preference.mutation.graphql';
+import { i18n } from '../constants';
+import getMergeRequestsQuery from '../queries/get_merge_requests.query.graphql';
+import getMergeRequestsCountsQuery from '../queries/get_merge_requests_counts.query.graphql';
+import MergeRequestStatistics from './merge_request_statistics.vue';
+
+export default {
+  i18n,
+  mergeRequestListTabs,
+  components: {
+    IssuableList,
+    CiIcon,
+    MergeRequestStatistics,
+  },
+  inject: [
+    'fullPath',
+    'hasAnyMergeRequests',
+    'initialSort',
+    'isPublicVisibilityRestricted',
+    'isSignedIn',
+  ],
+  data() {
+    return {
+      filterTokens: [],
+      mergeRequests: [],
+      mergeRequestCounts: {},
+      mergeRequestsError: null,
+      pageInfo: {},
+      pageParams: {},
+      sortKey: CREATED_DESC,
+      state: STATUS_OPEN,
+      pageSize: DEFAULT_PAGE_SIZE,
+    };
+  },
+  apollo: {
+    mergeRequests: {
+      query: getMergeRequestsQuery,
+      variables() {
+        return this.queryVariables;
+      },
+      update(data) {
+        return data.project.mergeRequests.nodes ?? [];
+      },
+      fetchPolicy: fetchPolicies.CACHE_AND_NETWORK,
+      nextFetchPolicy: fetchPolicies.CACHE_FIRST,
+      notifyOnNetworkStatusChange: true,
+      result({ data }) {
+        if (!data) {
+          return;
+        }
+        this.pageInfo = data.project.mergeRequests.pageInfo ?? {};
+      },
+      error(error) {
+        this.mergeRequestsError = this.$options.i18n.errorFetchingMergeRequests;
+        Sentry.captureException(error);
+      },
+      skip() {
+        return !this.hasAnyMergeRequests || isEmpty(this.pageParams);
+      },
+    },
+    mergeRequestCounts: {
+      query: getMergeRequestsCountsQuery,
+      variables() {
+        return this.queryVariables;
+      },
+      update(data) {
+        return data.project ?? {};
+      },
+      error(error) {
+        this.mergeRequestsError = this.$options.i18n.errorFetchingCounts;
+        Sentry.captureException(error);
+      },
+      skip() {
+        return !this.hasAnyMergeRequests || isEmpty(this.pageParams);
+      },
+    },
+  },
+  computed: {
+    queryVariables() {
+      return {
+        fullPath: this.fullPath,
+        hideUsers: this.isPublicVisibilityRestricted && !this.isSignedIn,
+        isSignedIn: this.isSignedIn,
+        sort: this.sortKey,
+        state: this.state,
+        ...this.pageParams,
+        ...this.apiFilterParams,
+        search: this.searchQuery,
+      };
+    },
+    hasSearch() {
+      return Boolean(
+        this.searchQuery ||
+          Object.keys(this.urlFilterParams).length ||
+          this.pageParams.afterCursor ||
+          this.pageParams.beforeCursor,
+      );
+    },
+    apiFilterParams() {
+      return convertToApiParams(this.filterTokens);
+    },
+    urlFilterParams() {
+      return convertToUrlParams(this.filterTokens);
+    },
+    searchQuery() {
+      return convertToSearchQuery(this.filterTokens);
+    },
+    searchTokens() {
+      return [];
+    },
+    showPaginationControls() {
+      return (
+        this.mergeRequests.length > 0 &&
+        (this.pageInfo.hasNextPage || this.pageInfo.hasPreviousPage)
+      );
+    },
+    sortOptions() {
+      return getSortOptions({ hasManualSort: false });
+    },
+    tabCounts() {
+      const {
+        openedMergeRequests,
+        closedMergeRequests,
+        mergedMergeRequests,
+        allMergeRequests,
+      } = this.mergeRequestCounts;
+      return {
+        [STATUS_OPEN]: openedMergeRequests?.count,
+        [STATUS_MERGED]: mergedMergeRequests?.count,
+        [STATUS_CLOSED]: closedMergeRequests?.count,
+        [STATUS_ALL]: allMergeRequests?.count,
+      };
+    },
+    urlParams() {
+      return {
+        sort: urlSortParams[this.sortKey],
+        state: this.state,
+        ...this.urlFilterParams,
+        first_page_size: this.pageParams.firstPageSize,
+        last_page_size: this.pageParams.lastPageSize,
+        page_after: this.pageParams.afterCursor ?? undefined,
+        page_before: this.pageParams.beforeCursor ?? undefined,
+      };
+    },
+    isLoading() {
+      return (
+        this.$apollo.queries.mergeRequests.loading &&
+        !this.$apollo.provider.clients.defaultClient.readQuery({
+          query: getMergeRequestsQuery,
+          variables: this.queryVariables,
+        })
+      );
+    },
+  },
+  created() {
+    this.updateData(this.initialSort);
+  },
+  methods: {
+    getStatus(mergeRequest) {
+      if (mergeRequest.state === STATUS_CLOSED) {
+        return this.$options.i18n.closed;
+      }
+      if (mergeRequest.state === STATUS_MERGED) {
+        return this.$options.i18n.merged;
+      }
+      return undefined;
+    },
+    handleClickTab(state) {
+      if (this.state === state) {
+        return;
+      }
+
+      this.state = state;
+      this.pageParams = getInitialPageParams(this.pageSize);
+
+      this.$router.push({ query: this.urlParams });
+    },
+    handleNextPage() {
+      this.pageParams = {
+        afterCursor: this.pageInfo.endCursor,
+        firstPageSize: this.pageSize,
+      };
+      scrollUp();
+
+      this.$router.push({ query: this.urlParams });
+    },
+    handlePreviousPage() {
+      this.pageParams = {
+        beforeCursor: this.pageInfo.startCursor,
+        lastPageSize: this.pageSize,
+      };
+      scrollUp();
+
+      this.$router.push({ query: this.urlParams });
+    },
+    handleSort(sortKey) {
+      if (this.sortKey === sortKey) {
+        return;
+      }
+
+      this.sortKey = sortKey;
+      this.pageParams = getInitialPageParams(this.pageSize);
+
+      if (this.isSignedIn) {
+        this.saveSortPreference(sortKey);
+      }
+
+      this.$router.push({ query: this.urlParams });
+    },
+    saveSortPreference(sortKey) {
+      this.$apollo
+        .mutate({
+          mutation: setSortPreferenceMutation,
+          variables: { input: { issuesSort: sortKey } },
+        })
+        .then(({ data }) => {
+          if (data.userPreferencesUpdate.errors.length) {
+            throw new Error(data.userPreferencesUpdate.errors);
+          }
+        })
+        .catch((error) => {
+          Sentry.captureException(error);
+        });
+    },
+    handlePageSizeChange(newPageSize) {
+      const pageParam = getParameterByName(PARAM_LAST_PAGE_SIZE) ? 'lastPageSize' : 'firstPageSize';
+      this.pageParams[pageParam] = newPageSize;
+      this.pageSize = newPageSize;
+      scrollUp();
+
+      this.$router.push({ query: this.urlParams });
+    },
+    updateData(sortValue) {
+      const firstPageSize = getParameterByName(PARAM_FIRST_PAGE_SIZE);
+      const lastPageSize = getParameterByName(PARAM_LAST_PAGE_SIZE);
+      const state = getParameterByName(PARAM_STATE);
+
+      const defaultSortKey = state === STATUS_CLOSED ? UPDATED_DESC : CREATED_DESC;
+      const dashboardSortKey = getSortKey(sortValue);
+      const graphQLSortKey = isSortKey(sortValue?.toUpperCase()) && sortValue.toUpperCase();
+
+      const sortKey = dashboardSortKey || graphQLSortKey || defaultSortKey;
+
+      const tokens = getFilterTokens(window.location.search);
+      this.filterTokens = tokens;
+
+      this.pageParams = getInitialPageParams(
+        this.pageSize,
+        isPositiveInteger(firstPageSize) ? parseInt(firstPageSize, 10) : undefined,
+        isPositiveInteger(lastPageSize) ? parseInt(lastPageSize, 10) : undefined,
+        getParameterByName(PARAM_PAGE_AFTER),
+        getParameterByName(PARAM_PAGE_BEFORE),
+      );
+      this.sortKey = sortKey;
+      this.state = state || STATUS_OPEN;
+    },
+  },
+};
+</script>
+
+<template>
+  <issuable-list
+    v-if="hasAnyMergeRequests"
+    :namespace="fullPath"
+    recent-searches-storage-key="merge_requests"
+    :search-tokens="searchTokens"
+    :initial-filter-value="filterTokens"
+    :sort-options="sortOptions"
+    :initial-sort-by="sortKey"
+    :issuables="mergeRequests"
+    :error="mergeRequestsError"
+    :tabs="$options.mergeRequestListTabs"
+    :current-tab="state"
+    :tab-counts="tabCounts"
+    :issuables-loading="isLoading"
+    :show-pagination-controls="showPaginationControls"
+    :default-page-size="pageSize"
+    sync-filter-and-sort
+    use-keyset-pagination
+    :has-next-page="pageInfo.hasNextPage"
+    :has-previous-page="pageInfo.hasPreviousPage"
+    @click-tab="handleClickTab"
+    @next-page="handleNextPage"
+    @previous-page="handlePreviousPage"
+    @sort="handleSort"
+    @page-size-change="handlePageSizeChange"
+  >
+    <template #status="{ issuable = {} }">
+      {{ getStatus(issuable) }}
+    </template>
+
+    <template #statistics="{ issuable = {} }">
+      <merge-request-statistics :merge-request="issuable" />
+    </template>
+
+    <template #pipeline-status="{ issuable = {} }">
+      <li
+        v-if="issuable.headPipeline && issuable.headPipeline.detailedStatus"
+        class="issuable-pipeline-status d-none d-sm-flex"
+      >
+        <ci-icon :status="issuable.headPipeline.detailedStatus" use-link show-tooltip />
+      </li>
+    </template>
+  </issuable-list>
+</template>

app/assets/javascripts/merge_requests/list/constants.js

+import { __ } from '~/locale';
+
+export const i18n = {
+  closed: __('Closed'),
+  merged: __('Merged'),
+  errorFetchingCounts: __('An error occurred while getting merge request counts'),
+  errorFetchingMergeRequests: __('An error occurred while loading merge requests'),
+  upvotes: __('Upvotes'),
+  downvots: __('Downvotes'),
+};

app/assets/javascripts/merge_requests/list/index.js

+import Vue from 'vue';
+import VueApollo from 'vue-apollo';
+import VueRouter from 'vue-router';
+import { parseBoolean } from '~/lib/utils/common_utils';
+import { defaultClient } from '~/graphql_shared/issuable_client';
+import MergeRequestsListApp from './components/merge_requests_list_app.vue';
+
+export async function mountMergeRequestListsApp() {
+  const el = document.querySelector('.js-merge-request-list-root');
+
+  if (!el) {
+    return null;
+  }
+
+  Vue.use(VueApollo);
+  Vue.use(VueRouter);
+
+  const {
+    fullPath,
+    hasAnyMergeRequests,
+    initialSort,
+    isPublicVisibilityRestricted,
+    isSignedIn,
+  } = el.dataset;
+
+  return new Vue({
+    el,
+    name: 'MergeRequestsListRoot',
+    apolloProvider: new VueApollo({
+      defaultClient,
+    }),
+    router: new VueRouter({
+      base: window.location.pathname,
+      mode: 'history',
+      routes: [{ path: '/' }],
+    }),
+    provide: {
+      fullPath,
+      hasAnyMergeRequests: parseBoolean(hasAnyMergeRequests),
+      initialSort,
+      isPublicVisibilityRestricted: parseBoolean(isPublicVisibilityRestricted),
+      isSignedIn: parseBoolean(isSignedIn),
+    },
+    render: (createComponent) => createComponent(MergeRequestsListApp),
+  });
+}

app/assets/javascripts/merge_requests/list/queries/get_merge_requests.query.graphql

+#import "~/graphql_shared/fragments/page_info.fragment.graphql"
+#import "./merge_request.fragment.graphql"
+
+query getMergeRequests(
+  $hideUsers: Boolean = false
+  $isSignedIn: Boolean = false
+  $fullPath: ID!
+  $sort: MergeRequestSort
+  $state: MergeRequestState
+  $beforeCursor: String
+  $afterCursor: String
+  $firstPageSize: Int
+  $lastPageSize: Int
+) {
+  project(fullPath: $fullPath) {
+    id
+    mergeRequests(
+      sort: $sort
+      state: $state
+      before: $beforeCursor
+      after: $afterCursor
+      first: $firstPageSize
+      last: $lastPageSize
+    ) {
+      pageInfo {
+        ...PageInfo
+      }
+      nodes {
+        ...MergeRequestFragment
+      }
+    }
+  }
+}

app/assets/javascripts/merge_requests/list/queries/get_merge_requests_counts.query.graphql

+query getMergeRequestsCount($fullPath: ID!) {
+  project(fullPath: $fullPath) {
+    id
+    openedMergeRequests: mergeRequests(state: opened) {
+      count
+    }
+    mergedMergeRequests: mergeRequests(state: merged) {
+      count
+    }
+    closedMergeRequests: mergeRequests(state: closed) {
+      count
+    }
+    allMergeRequests: mergeRequests(state: all) {
+      count
+    }
+  }
+}

app/assets/javascripts/merge_requests/list/queries/merge_request.fragment.graphql

+#import "~/graphql_shared/fragments/user.fragment.graphql"
+
+fragment MergeRequestFragment on MergeRequest {
+  id
+  iid
+  createdAt
+  downvotes
+  state
+  title
+  updatedAt
+  upvotes
+  userDiscussionsCount @include(if: $isSignedIn)
+  webUrl
+  assignees @skip(if: $hideUsers) {
+    nodes {
+      ...User
+    }
+  }
+  author @skip(if: $hideUsers) {
+    ...User
+  }
+  labels {
+    nodes {
+      id
+      color
+      title
+      description
+    }
+  }
+  milestone {
+    id
+    dueDate
+    startDate
+    webPath
+    title
+  }
+  headPipeline {
+    id
+    detailedStatus {
+      id
+      icon
+      text
+      detailsPath
+    }
+  }
+}

app/assets/javascripts/pages/projects/merge_requests/index/index.js

@@ -5,6 +5,7 @@ import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered
 import { FILTERED_SEARCH } from '~/filtered_search/constants';
 import { initBulkUpdateSidebar, initCsvImportExportButtons, initIssuableByEmail } from '~/issuable';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
+import { mountMergeRequestListsApp } from '~/merge_requests/list';
 
 initBulkUpdateSidebar('merge_request_');
 
@@ -21,3 +22,4 @@ addShortcutsExtension(ShortcutsNavigation);
 
 initIssuableByEmail();
 initCsvImportExportButtons();
+mountMergeRequestListsApp();

app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js

 import AccessorUtilities from '~/lib/utils/accessor';
+import { GlTabsBehavior } from '~/tabs';
 
 /**
  * Memorize the last selected tab after reloading a page.
  * Does that setting the current selected tab in the localStorage
  */
 export default class SigninTabsMemoizer {
-  constructor({ currentTabKey = 'current_signin_tab', tabSelector = 'ul.new-session-tabs' } = {}) {
+  constructor({ currentTabKey = 'current_signin_tab', tabSelector = '#js-signin-tabs' } = {}) {
     this.currentTabKey = currentTabKey;
     this.tabSelector = tabSelector;
     this.isLocalStorageAvailable = AccessorUtilities.canUseLocalStorage();
@@ -18,9 +19,11 @@ export default class SigninTabsMemoizer {
   }
 
   bootstrap() {
-    const tabs = document.querySelectorAll(this.tabSelector);
-    if (tabs.length > 0) {
-      tabs[0].addEventListener('click', (e) => {
+    const tabNav = document.querySelector(this.tabSelector);
+    if (tabNav) {
+      // eslint-disable-next-line no-new
+      new GlTabsBehavior(tabNav);
+      tabNav.addEventListener('click', (e) => {
         if (e.target && e.target.nodeName === 'A') {
           const anchorName = e.target.getAttribute('href');
           this.saveData(anchorName);

app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue

@@ -272,11 +272,11 @@ export default {
           <template v-if="hasProjectKeySupport" #description>
             <gl-sprintf
               :message="
-                __('Add a suffix to Service Desk email address. %{linkStart}Learn more.%{linkEnd}')
+                __('Add a suffix to Service Desk email address. %{linkStart}Learn more%{linkEnd}.')
               "
             >
               <template #link="{ content }">
-                <gl-link :href="emailSuffixHelpUrl" target="_blank">{{ content }} </gl-link>
+                <gl-link :href="emailSuffixHelpUrl" target="_blank">{{ content }}</gl-link>
               </template>
             </gl-sprintf>
           </template>
@@ -285,14 +285,14 @@ export default {
               <gl-sprintf
                 :message="
                   __(
-                    'To add a custom suffix, set up a Service Desk email address. %{linkStart}Learn more.%{linkEnd}',
+                    'To add a custom suffix, set up a Service Desk email address. %{linkStart}Learn more%{linkEnd}.',
                   )
                 "
               >
                 <template #link="{ content }">
-                  <gl-link :href="serviceDeskEmailAddressHelpUrl" target="_blank"
-                    >{{ content }}
-                  </gl-link>
+                  <gl-link :href="serviceDeskEmailAddressHelpUrl" target="_blank">{{
+                    content
+                  }}</gl-link>
                 </template>
               </gl-sprintf>
             </span>

app/assets/javascripts/repository/mixins/highlight_mixin.js

@@ -6,7 +6,6 @@ import {
   ROUGE_TO_HLJS_LANGUAGE_MAP,
 } from '~/vue_shared/components/source_viewer/constants';
 import { splitIntoChunks } from '~/vue_shared/components/source_viewer/workers/highlight_utils';
-import LineHighlighter from '~/blob/line_highlighter';
 import languageLoader from '~/content_editor/services/highlight_js_language_loader';
 import Tracking from '~/tracking';
 import axios from '~/lib/utils/axios_utils';
@@ -98,26 +97,27 @@ export default {
     instructWorker(content, language, fileType) {
       this.highlightWorker.postMessage({ content, language, fileType });
     },
-    async highlightHash() {
+    highlightHash() {
       const { hash } = this.$route;
       if (!hash) return;
 
-      // Make the chunk containing the line number visible
-      const lineNumber = hash.substring(hash.indexOf('L') + 1).split('-')[0];
-      const chunkToHighlight = this.chunks.find(
-        (chunk) =>
-          chunk.startingFrom <= lineNumber && chunk.startingFrom + chunk.totalLines >= lineNumber,
-      );
+      const [fromLineNumber, toLineNumber] = hash.substring(hash.indexOf('L') + 1).split('-');
+      const isInRange = ({ startingFrom, totalLines }, lineNumber) =>
+        startingFrom <= lineNumber && startingFrom + totalLines >= lineNumber;
 
-      if (chunkToHighlight) {
-        chunkToHighlight.isHighlighted = true;
-      }
-
-      // Line numbers in the DOM needs to update first based on changes made to `chunks`.
-      await this.$nextTick();
+      this.chunks.map((chunk) => {
+        const formattedChunk = chunk;
+        const totalLineSpan = chunk.startingFrom + chunk.totalLines;
+        if (
+          fromLineNumber >= chunk.startingFrom ||
+          totalLineSpan <= toLineNumber ||
+          isInRange(chunk, toLineNumber)
+        ) {
+          formattedChunk.isHighlighted = true; // Make the chunk containing the line number visible
+        }
 
-      const lineHighlighter = new LineHighlighter({ scrollBehavior: 'auto' });
-      lineHighlighter.highlightHash(hash);
+        return formattedChunk;
+      });
     },
   },
 };

app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue

@@ -6,7 +6,6 @@ import { createAlert } from '~/alert';
 import { TYPE_ISSUE } from '~/issues/constants';
 import { __ } from '~/locale';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { fetchUserCounts } from '~/super_sidebar/user_counts_fetch';
 import eventHub from '../../event_hub';
 import getMergeRequestReviewersQuery from '../../queries/get_merge_request_reviewers.query.graphql';
@@ -27,7 +26,6 @@ export default {
     ReviewerTitle,
     Reviewers,
   },
-  mixins: [glFeatureFlagsMixin()],
   props: {
     mediator: {
       type: Object,
@@ -58,7 +56,6 @@ export default {
         return {
           iid: this.issuableIid,
           fullPath: this.projectPath,
-          mrRequestChanges: this.glFeatures.mrRequestChanges,
         };
       },
       update(data) {
@@ -77,7 +74,6 @@ export default {
         variables() {
           return {
             issuableId: this.issuable?.id,
-            mrRequestChanges: this.glFeatures.mrRequestChanges,
           };
         },
         skip() {