.gitlab-ci.yml

@@ -130,27 +130,6 @@ variables:
   REGISTRY_HOST: "registry.gitlab.com"
   REGISTRY_GROUP: "gitlab-org"
 
-  # Preparing custom clone path to reduce space used by all random forks
-  # on GitLab.com's Shared Runners. Our main forks - especially the security
-  # ones - will have this variable overwritten in the project settings, so that
-  # a security-related code or code using our protected variables will be never
-  # stored on the same path as the community forks.
-  # Part of the solution for the `no space left on device` problem described at
-  # https://gitlab.com/gitlab-org/gitlab/issues/197876.
-  #
-  # For this purpose the https://gitlab.com/gitlab-org-forks group was created
-  # to host a placeholder for the `/builds/gitlab-org-forks` path and ensure
-  # that no legitimate project will ever use it and - by mistake - execute its
-  # job on a shared working directory. It also requires proper configuration of
-  # the Runner that executes the job (which was prepared for our shared runners
-  # by https://ops.gitlab.net/gitlab-cookbooks/chef-repo/-/merge_requests/3977).
-  #
-  # Because of all of that PLEASE DO NOT CHANGE THE PATH.
-  #
-  # For more details and reasoning that brought this change please check
-  # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24887
-  GIT_CLONE_PATH: "/builds/gitlab-org-forks/${CI_PROJECT_NAME}"
-
 include:
   - local: .gitlab/ci/*.gitlab-ci.yml
   - remote: 'https://gitlab.com/gitlab-org/frontend/untamper-my-lockfile/-/raw/main/templates/merge_request_pipelines.yml'

.gitlab/ci/rules.gitlab-ci.yml

@@ -927,6 +927,8 @@
 
 .qa:rules:package-and-qa:
   rules:
+    - <<: *if-fork-merge-request
+      when: never
     - <<: *if-not-ee
       when: never
     - <<: *if-merge-request-labels-pipeline-revert

.rubocop.yml

@@ -44,7 +44,7 @@ AllCops:
     - 'db/ci_migrate/*.rb'      # since the `db/ci_migrate` is a symlinked to `db/migrate`
   # Use absolute path to avoid orphan directories with changed workspace root.
   CacheRootDirectory: <%= Dir.getwd %>/tmp
-  MaxFilesInCache: 30000
+  MaxFilesInCache: 35000
 
 Metrics/ParameterLists:
   Exclude:
@@ -569,6 +569,8 @@ RSpec/ImplicitSubject:
 RSpec/ReceiveNever:
   Enabled: false
 
+# Already covered by `RSpec::Configuration#on_potential_false_positives = :raise`.
+# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86429
 RSpec/UnspecifiedException:
   Enabled: false
 
@@ -600,9 +602,6 @@ Style/MultilineWhenThen:
 Style/NumericPredicate:
   EnforcedStyle: comparison
 
-Style/FloatDivision:
-  Enabled: false
-
 Cop/BanCatchThrow:
   Enabled: true
 

.rubocop_todo/layout/hash_alignment.yml

@@ -2,46 +2,7 @@
 # Cop supports --auto-correct.
 Layout/HashAlignment:
   Exclude:
-    - 'ee/spec/helpers/billing_plans_helper_spec.rb'
-    - 'ee/spec/helpers/routing/pseudonymization_helper_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/auth/ldap/access_levels_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/auth/ldap/config_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/backfill_project_statistics_container_repository_size_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/delete_invalid_epic_issues_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/fix_incorrect_max_seats_used_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/ci/config/entry/need_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/ci/matching/runner_matcher_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/elastic/helper_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/import_export/group/legacy_tree_saver_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/import_export/group/tree_saver_spec.rb'
     - 'ee/spec/lib/ee/gitlab/usage_data_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/ldap/person_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/smartcard/certificate_spec.rb'
-    - 'ee/spec/lib/gitlab/custom_file_templates_spec.rb'
-    - 'ee/spec/lib/gitlab/elastic/client_spec.rb'
-    - 'ee/spec/lib/gitlab/elastic/indexer_spec.rb'
-    - 'ee/spec/lib/gitlab/insights/loader_spec.rb'
-    - 'ee/spec/lib/gitlab/template/custom_templates_spec.rb'
-    - 'ee/spec/services/arkose/blocked_users_report_service_spec.rb'
-    - 'ee/spec/services/audit_events/protected_branch_audit_event_service_spec.rb'
-    - 'ee/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb'
-    - 'ee/spec/services/ci/create_pipeline_service/cross_needs_artifacts_spec.rb'
-    - 'ee/spec/services/ci/process_pipeline_service_spec.rb'
-    - 'ee/spec/services/ci/retry_pipeline_service_spec.rb'
-    - 'ee/spec/services/ci/subscribe_bridge_service_spec.rb'
-    - 'ee/spec/services/ee/merge_requests/create_pipeline_service_spec.rb'
-    - 'ee/spec/services/merge_trains/check_status_service_spec.rb'
-    - 'ee/spec/services/merge_trains/create_pipeline_service_spec.rb'
-    - 'ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb'
-    - 'ee/spec/services/merge_trains/refresh_service_spec.rb'
-    - 'ee/spec/services/status_page/trigger_publish_service_spec.rb'
-    - 'ee/spec/services/status_page/unpublish_details_service_spec.rb'
-    - 'ee/spec/services/vulnerabilities/create_from_security_finding_service_spec.rb'
-    - 'ee/spec/services/vulnerabilities/findings/create_from_security_finding_service_spec.rb'
-    - 'ee/spec/support/shared_examples/services/audit_event_logging_shared_examples.rb'
-    - 'ee/spec/support/shared_examples/status_page/publish_shared_examples.rb'
-    - 'ee/spec/support/shared_examples/status_page/reference_links_examples.rb'
-    - 'ee/spec/workers/scan_security_report_secrets_worker_spec.rb'
     - 'lib/gitlab/no_cache_headers.rb'
     - 'lib/gitlab/sidekiq_daemon/memory_killer.rb'
     - 'lib/gitlab/sidekiq_middleware/server_metrics.rb'
@@ -65,26 +26,6 @@ Layout/HashAlignment:
     - 'spec/controllers/projects/pipeline_schedules_controller_spec.rb'
     - 'spec/controllers/projects/registry/tags_controller_spec.rb'
     - 'spec/controllers/projects/service_desk_controller_spec.rb'
-    - 'spec/db/migration_spec.rb'
-    - 'spec/finders/ci/pipelines_for_merge_request_finder_spec.rb'
-    - 'spec/finders/group_descendants_finder_spec.rb'
-    - 'spec/finders/group_members_finder_spec.rb'
-    - 'spec/finders/template_finder_spec.rb'
-    - 'spec/graphql/mutations/releases/update_spec.rb'
-    - 'spec/graphql/resolvers/board_lists_resolver_spec.rb'
-    - 'spec/graphql/resolvers/ci/config_resolver_spec.rb'
-    - 'spec/graphql/resolvers/ci/group_runners_resolver_spec.rb'
-    - 'spec/graphql/resolvers/ci/jobs_resolver_spec.rb'
-    - 'spec/graphql/resolvers/ci/runners_resolver_spec.rb'
-    - 'spec/graphql/resolvers/container_repositories_resolver_spec.rb'
-    - 'spec/graphql/resolvers/container_repository_tags_resolver_spec.rb'
-    - 'spec/graphql/resolvers/design_management/versions_resolver_spec.rb'
-    - 'spec/graphql/resolvers/work_items_resolver_spec.rb'
-    - 'spec/helpers/ci/builds_helper_spec.rb'
-    - 'spec/helpers/sorting_helper_spec.rb'
-    - 'spec/helpers/storage_helper_spec.rb'
-    - 'spec/helpers/wiki_helper_spec.rb'
-    - 'spec/initializers/00_rails_disable_joins_spec.rb'
     - 'spec/lib/backup/gitaly_backup_spec.rb'
     - 'spec/lib/banzai/filter/repository_link_filter_spec.rb'
     - 'spec/lib/gitlab/asciidoc_spec.rb'
@@ -135,26 +76,6 @@ Layout/HashAlignment:
     - 'spec/lib/gitlab/metrics/subscribers/action_view_spec.rb'
     - 'spec/lib/gitlab/metrics/subscribers/active_record_spec.rb'
     - 'spec/lib/gitlab/metrics/subscribers/load_balancing_spec.rb'
-    - 'spec/lib/gitlab/metrics/web_transaction_spec.rb'
-    - 'spec/lib/gitlab/omniauth_initializer_spec.rb'
-    - 'spec/lib/gitlab/sidekiq_daemon/memory_killer_spec.rb'
-    - 'spec/lib/gitlab/sidekiq_death_handler_spec.rb'
-    - 'spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb'
-    - 'spec/lib/gitlab/slug/environment_spec.rb'
-    - 'spec/lib/gitlab/tracking_spec.rb'
-    - 'spec/lib/gitlab/usage_data/topology_spec.rb'
-    - 'spec/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter_spec.rb'
-    - 'spec/lib/gitlab/usage_data_counters/note_counter_spec.rb'
-    - 'spec/lib/gitlab/usage_data_spec.rb'
-    - 'spec/lib/gitlab/utils_spec.rb'
-    - 'spec/lib/gitlab/word_diff/parser_spec.rb'
-    - 'spec/lib/marginalia_spec.rb'
-    - 'spec/lib/security/ci_configuration/sast_build_action_spec.rb'
-    - 'spec/mailers/emails/pipelines_spec.rb'
-    - 'spec/migrations/20210804150320_create_base_work_item_types_spec.rb'
-    - 'spec/migrations/20210831203408_upsert_base_work_item_types_spec.rb'
-    - 'spec/migrations/20211117084814_migrate_remaining_u2f_registrations_spec.rb'
-    - 'spec/migrations/20211126204445_add_task_to_work_item_types_spec.rb'
     - 'spec/models/ci/build_spec.rb'
     - 'spec/models/ci/pipeline_spec.rb'
     - 'spec/models/ci/processable_spec.rb'

.rubocop_todo/rspec/verified_doubles.yml

@@ -90,7 +90,6 @@ RSpec/VerifiedDoubles:
     - ee/spec/lib/sidebars/groups/menus/analytics_menu_spec.rb
     - ee/spec/lib/system_check/geo/geo_database_configured_check_spec.rb
     - ee/spec/models/app_sec/fuzzing/api/ci_configuration_spec.rb
-    - ee/spec/models/ee/approvable_spec.rb
     - ee/spec/models/concerns/geo/verification_state_spec.rb
     - ee/spec/models/ee/ci/job_artifact_spec.rb
     - ee/spec/models/ee/user_spec.rb

.rubocop_todo/style/float_division.yml

+---
+Style/FloatDivision:
+  Exclude:
+    - 'ee/app/models/geo_node_status.rb'
+    - 'ee/app/models/namespaces/storage/root_size.rb'
+    - 'lib/learn_gitlab/onboarding.rb'
+    - 'qa/qa/support/formatters/allure_metadata_formatter.rb'
+    - 'qa/qa/tools/reliable_report.rb'

.rubocop_todo/style/percent_literal_delimiters.yml

@@ -254,7 +254,6 @@ Style/PercentLiteralDelimiters:
     - 'ee/app/mailers/previews/license_mailer_preview.rb'
     - 'ee/app/models/app_sec/fuzzing/api/scan_profile.rb'
     - 'ee/app/models/app_sec/fuzzing/coverage/corpus.rb'
-    - 'ee/app/models/concerns/ee/approvable.rb'
     - 'ee/app/models/concerns/ee/issue_available_features.rb'
     - 'ee/app/models/ee/audit_event.rb'
     - 'ee/app/models/ee/description_version.rb'

.rubocop_todo/style/redundant_self.yml

@@ -47,7 +47,6 @@ Style/RedundantSelf:
     - 'app/models/commit_status.rb'
     - 'app/models/compare.rb'
     - 'app/models/concerns/after_commit_queue.rb'
-    - 'app/models/concerns/approvable.rb'
     - 'app/models/concerns/atomic_internal_id.rb'
     - 'app/models/concerns/avatarable.rb'
     - 'app/models/concerns/awardable.rb'

Gemfile

@@ -171,7 +171,7 @@ gem 'asciidoctor-kroki', '~> 0.5.0', require: false
 gem 'rouge', '~> 3.30.0'
 gem 'truncato', '~> 0.7.12'
 gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.13.0'
+gem 'nokogiri', '~> 1.13.8'
 gem 'escape_utils', '~> 1.1'
 
 # Calendar rendering
@@ -320,9 +320,7 @@ gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation
 gem 'gitlab-labkit', '~> 0.24.0'
-# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
-# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
-gem 'thrift', '>= 0.14.0'
+gem 'thrift', '>= 0.16.0'
 
 # I18n
 gem 'ruby_parser', '~> 3.15', require: false
@@ -408,7 +406,7 @@ group :development, :test do
 end
 
 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 3.5.0', require: false
+  gem 'gitlab-dangerfiles', '~> 3.5.1', require: false
 end
 
 group :development, :test, :coverage do

Gemfile.lock

@@ -516,7 +516,7 @@ GEM
       terminal-table (~> 1.5, >= 1.5.1)
     gitlab-chronic (0.10.5)
       numerizer (~> 0.2)
-    gitlab-dangerfiles (3.5.0)
+    gitlab-dangerfiles (3.5.1)
       danger (>= 8.4.5)
       danger-gitlab (>= 8.0.0)
       rake
@@ -1364,7 +1364,7 @@ GEM
       faraday (~> 1.0)
     text (1.3.1)
     thor (1.2.1)
-    thrift (0.14.0)
+    thrift (0.16.0)
     tilt (2.0.10)
     timecop (0.9.1)
     timeliness (0.3.10)
@@ -1577,7 +1577,7 @@ DEPENDENCIES
   gitaly (~> 15.3.0.pre.rc4)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
-  gitlab-dangerfiles (~> 3.5.0)
+  gitlab-dangerfiles (~> 3.5.1)
   gitlab-experiment (~> 0.7.1)
   gitlab-fog-azure-rm (~> 1.3.0)
   gitlab-labkit (~> 0.24.0)
@@ -1648,7 +1648,7 @@ DEPENDENCIES
   multi_json (~> 1.14.1)
   net-ldap (~> 0.16.3)
   net-ntp
-  nokogiri (~> 1.13.0)
+  nokogiri (~> 1.13.8)
   oauth2 (~> 2.0)
   octokit (~> 4.15)
   ohai (~> 16.10)
@@ -1759,7 +1759,7 @@ DEPENDENCIES
   terser (= 1.0.2)
   test-prof (~> 1.0.7)
   test_file_finder (~> 0.1.3)
-  thrift (>= 0.14.0)
+  thrift (>= 0.16.0)
   timecop (~> 0.9.1)
   timfel-krb5-auth (~> 0.8)
   toml-rb (~> 2.0)

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

 <script>
 import $ from 'jquery';
-import { GlDropdown, GlButton, GlIcon, GlForm, GlFormGroup, GlLink } from '@gitlab/ui';
+import {
+  GlDropdown,
+  GlButton,
+  GlIcon,
+  GlForm,
+  GlFormGroup,
+  GlLink,
+  GlFormCheckbox,
+} from '@gitlab/ui';
 import { mapGetters, mapActions } from 'vuex';
+import { createAlert } from '~/flash';
 import MarkdownField from '~/vue_shared/components/markdown/field.vue';
 import { scrollToElement } from '~/lib/utils/common_utils';
 import Autosave from '~/autosave';
@@ -15,29 +24,46 @@ export default {
     GlForm,
     GlFormGroup,
     GlLink,
+    GlFormCheckbox,
     MarkdownField,
+    ApprovalPassword: () => import('ee_component/batch_comments/components/approval_password.vue'),
   },
   data() {
     return {
       isSubmitting: false,
-      note: '',
+      noteData: {
+        noteable_type: '',
+        noteable_id: '',
+        note: '',
+        approve: false,
+        approval_password: '',
+      },
     };
   },
   computed: {
     ...mapGetters(['getNotesData', 'getNoteableData', 'noteableType', 'getCurrentUserLastNote']),
   },
+  watch: {
+    'noteData.approve': function noteDataApproveWatch() {
+      setTimeout(() => {
+        this.repositionDropdown();
+      });
+    },
+  },
   mounted() {
     this.autosave = new Autosave(
       $(this.$refs.textarea),
       `submit_review_dropdown/${this.getNoteableData.id}`,
     );
+    this.noteData.noteable_type = this.noteableType;
+    this.noteData.noteable_id = this.getNoteableData.id;
 
     // We override the Bootstrap Vue click outside behaviour
     // to allow for clicking in the autocomplete dropdowns
     // without this override the submit dropdown will close
     // whenever a item in the autocomplete dropdown is clicked
-    const originalClickOutHandler = this.$refs.dropdown.$refs.dropdown.clickOutHandler;
-    this.$refs.dropdown.$refs.dropdown.clickOutHandler = (e) => {
+    const originalClickOutHandler = this.$refs.submitDropdown.$refs.dropdown.clickOutHandler;
+    this.$refs.submitDropdown.$refs.dropdown.clickOutHandler = (e) => {
       if (!e.target.closest('.atwho-container')) {
         originalClickOutHandler(e);
       }
@@ -45,26 +71,29 @@ export default {
   },
   methods: {
     ...mapActions('batchComments', ['publishReview']),
+    repositionDropdown() {
+      this.$refs.submitDropdown?.$refs.dropdown?.updatePopper();
+    },
     async submitReview() {
-      const noteData = {
-        noteable_type: this.noteableType,
-        noteable_id: this.getNoteableData.id,
-        note: this.note,
-      };
-
       this.isSubmitting = true;
 
-      await this.publishReview(noteData);
+      try {
+        await this.publishReview(this.noteData);
 
-      this.autosave.reset();
+        this.autosave.reset();
 
-      if (window.mrTabs && this.note) {
-        window.location.hash = `note_${this.getCurrentUserLastNote.id}`;
-        window.mrTabs.tabShown('show');
+        if (window.mrTabs && this.note) {
+          window.location.hash = `note_${this.getCurrentUserLastNote.id}`;
+          window.mrTabs.tabShown('show');
 
-        setTimeout(() =>
-          scrollToElement(document.getElementById(`note_${this.getCurrentUserLastNote.id}`)),
-        );
+          setTimeout(() =>
+            scrollToElement(document.getElementById(`note_${this.getCurrentUserLastNote.id}`)),
+          );
+        }
+      } catch (e) {
+        if (e.data?.message) {
+          createAlert({ message: e.data.message, captureError: true });
+        }
       }
 
       this.isSubmitting = false;
@@ -79,8 +108,9 @@ export default {
 
 <template>
   <gl-dropdown
-    ref="dropdown"
+    ref="submitDropdown"
     right
+    dropup
     class="submit-review-dropdown"
     data-qa-selector="submit_review_dropdown"
     variant="info"
@@ -110,7 +140,7 @@ export default {
             <markdown-field
               :is-submitting="isSubmitting"
               :add-spacing-classes="false"
-              :textarea-value="note"
+              :textarea-value="noteData.note"
               :markdown-preview-path="getNoteableData.preview_note_path"
               :markdown-docs-path="getNotesData.markdownDocsPath"
               :quick-actions-docs-path="getNotesData.quickActionsDocsPath"
@@ -122,7 +152,7 @@ export default {
                 <textarea
                   id="review-note-body"
                   ref="textarea"
-                  v-model="note"
+                  v-model="noteData.note"
                   dir="auto"
                   :disabled="isSubmitting"
                   name="review[note]"
@@ -139,6 +169,18 @@ export default {
           </div>
         </div>
       </gl-form-group>
+      <template v-if="getNoteableData.current_user.can_approve">
+        <gl-form-checkbox v-model="noteData.approve" data-testid="approve_merge_request">
+          {{ __('Approve merge request') }}
+        </gl-form-checkbox>
+        <approval-password
+          v-if="getNoteableData.require_password_to_approve"
+          v-show="noteData.approve"
+          v-model="noteData.approval_password"
+          class="gl-mt-3"
+          data-testid="approve_password"
+        />
+      </template>
       <div class="gl-display-flex gl-justify-content-start gl-mt-5">
         <gl-button
           :loading="isSubmitting"

app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js

@@ -84,7 +84,11 @@ export const publishReview = ({ commit, dispatch, getters }, noteData = {}) => {
     .publish(getters.getNotesData.draftsPublishPath, noteData)
     .then(() => dispatch('updateDiscussionsAfterPublish'))
     .then(() => commit(types.RECEIVE_PUBLISH_REVIEW_SUCCESS))
-    .catch(() => commit(types.RECEIVE_PUBLISH_REVIEW_ERROR));
+    .catch((e) => {
+      commit(types.RECEIVE_PUBLISH_REVIEW_ERROR);
+
+      throw e.response;
+    });
 };
 
 export const updateDiscussionsAfterPublish = async ({ dispatch, getters, rootGetters }) => {

app/assets/javascripts/blob/3d_viewer/index.js

-import OrbitControlsClass from 'three-orbit-controls';
-import STLLoaderClass from 'three-stl-loader';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
+import { STLLoader } from 'three/examples/jsm/loaders/STLLoader';
 import * as THREE from 'three/build/three.module';
 import MeshObject from './mesh_object';
 
-const STLLoader = STLLoaderClass(THREE);
-const OrbitControls = OrbitControlsClass(THREE);
-
 export default class Renderer {
   constructor(container) {
     this.renderWrapper = this.render.bind(this);

app/assets/javascripts/blob/3d_viewer/mesh_object.js

@@ -22,7 +22,7 @@ export default class MeshObject extends Mesh {
     if (this.geometry.boundingSphere.radius > 4) {
       const scale = 4 / this.geometry.boundingSphere.radius;
 
-      this.geometry.applyMatrix(new Matrix4().makeScale(scale, scale, scale));
+      this.geometry.applyMatrix4(new Matrix4().makeScale(scale, scale, scale));
       this.geometry.computeBoundingSphere();
 
       this.position.x = -this.geometry.boundingSphere.center.x;

app/assets/javascripts/blob/blob_blame_link.js

+function addBlameLink(containerSelector, linkClass) {
+  const containerEl = document.querySelector(containerSelector);
+
+  if (!containerEl) {
+    return;
+  }
+
+  containerEl.addEventListener('mouseover', (e) => {
+    const isLineLink = e.target.classList.contains(linkClass);
+    if (isLineLink) {
+      const lineLink = e.target;
+      const lineLinkCopy = lineLink.cloneNode(true);
+      lineLinkCopy.classList.remove(linkClass, 'diff-line-num');
+
+      const { lineNumber } = lineLink.dataset;
+      const { blamePath } = document.querySelector('.line-numbers').dataset;
+      const blameLink = document.createElement('a');
+      blameLink.classList.add('file-line-blame');
+      blameLink.href = `${blamePath}#L${lineNumber}`;
+
+      const wrapper = document.createElement('div');
+      wrapper.classList.add('line-links', 'diff-line-num');
+
+      wrapper.appendChild(blameLink);
+      wrapper.appendChild(lineLinkCopy);
+      lineLink.replaceWith(wrapper);
+    }
+  });
+}
+
+export default addBlameLink;

app/assets/javascripts/blob/blob_links_tracking.js

 import Tracking from '~/tracking';
 
-function addBlobLinksTracking(containerSelector, eventsToTrack) {
-  const containerEl = document.querySelector(containerSelector);
+const eventsToTrack = [
+  { selector: '.file-line-blame', property: 'blame' },
+  { selector: '.file-line-num', property: 'link' },
+];
+
+function addBlobLinksTracking() {
+  const containerEl = document.querySelector('.file-holder');
 
   if (!containerEl) {
     return;

app/assets/javascripts/blob/notebook/notebook_viewer.vue

 <script>
 import { GlLoadingIcon } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
-import notebookLab from '~/notebook/index.vue';
+import NotebookLab from '~/notebook/index.vue';
 
 export default {
   components: {
-    notebookLab,
+    NotebookLab,
     GlLoadingIcon,
   },
   props: {

app/assets/javascripts/boards/components/board_card_inner.vue

@@ -38,6 +38,8 @@ export default {
     GlSprintf,
     BoardCardMoveToPosition,
     WorkItemTypeIcon,
+    IssueHealthStatus: () =>
+      import('ee_component/related_items_tree/components/issue_health_status.vue'),
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -381,6 +383,7 @@ export default {
               :weight="item.weight"
               @click="filterByWeight(item.weight)"
             />
+            <issue-health-status v-if="item.healthStatus" :health-status="item.healthStatus" />
           </span>
         </span>
       </div>

app/assets/javascripts/boards/components/board_card_move_to_position.vue

 <script>
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
-import { mapActions, mapGetters } from 'vuex';
+import { mapActions, mapGetters, mapState } from 'vuex';
 import { s__ } from '~/locale';
-import { DEFAULT_BOARD_LIST_ITEMS_SIZE } from 'ee_else_ce/boards/constants';
 
 import Tracking from '~/tracking';
 
@@ -34,6 +33,7 @@ export default {
     },
   },
   computed: {
+    ...mapState(['pageInfoByListId']),
     ...mapGetters(['getBoardItemsByList']),
     tracking() {
       return {
@@ -45,6 +45,9 @@ export default {
     listItems() {
       return this.getBoardItemsByList(this.list.id);
     },
+    listHasNextPage() {
+      return this.pageInfoByListId[this.list.id]?.hasNextPage;
+    },
     firstItemInListId() {
       return this.listItems[0]?.id;
     },
@@ -58,7 +61,7 @@ export default {
       return `${this.item.id}-${this.item.iid}-${this.index}`;
     },
     showMoveToEndOfList() {
-      return this.lengthOfListItemsInBoard <= DEFAULT_BOARD_LIST_ITEMS_SIZE;
+      return !this.listHasNextPage;
     },
     isFirstItemInList() {
       return this.index === 0;

app/assets/javascripts/ci_variable_list/components/ci_admin_variables.vue

@@ -11,11 +11,11 @@ import {
 import addAdminVariable from '../graphql/mutations/admin_add_variable.mutation.graphql';
 import deleteAdminVariable from '../graphql/mutations/admin_delete_variable.mutation.graphql';
 import updateAdminVariable from '../graphql/mutations/admin_update_variable.mutation.graphql';
-import ciVariableSettings from './ci_variable_settings.vue';
+import CiVariableSettings from './ci_variable_settings.vue';
 
 export default {
   components: {
-    ciVariableSettings,
+    CiVariableSettings,
   },
   inject: ['endpoint'],
   data() {