app/assets/stylesheets/pages/issues.scss

@@ -272,7 +272,8 @@ ul.related-merge-requests > li gl-emoji {
 .md-header-preview {
   z-index: 1;
   position: sticky;
-  top: calc(#{$calc-application-header-height} + var(--issuable-sticky-header-height, 0px));
+  top: calc(#{$calc-application-header-height} + var(--issuable-sticky-header-height, 0px) - 2px);
+  @apply gl-bg-default;
 }
 
 .detail-page-description .md-header {

app/assets/stylesheets/pages/settings.scss

@@ -68,11 +68,11 @@ $sticky-header-z-index: 98;
 .settings-sticky-header,
 .settings-sticky-footer {
   position: sticky;
-  z-index: $sticky-header-z-index;
   @apply gl-bg-default;
 }
 
 .settings-sticky-header {
+  z-index: $sticky-header-z-index;
   top: $calc-application-header-height;
 
   &::before {
@@ -93,6 +93,7 @@ $sticky-header-z-index: 98;
 }
 
 .settings-sticky-footer {
+  z-index: #{$sticky-header-z-index +1};
   bottom: 0;
   padding: $gl-padding-8 0;
   box-shadow: 0 -1px 0 var(--gl-border-color-default);

app/controllers/dashboard/todos_controller.rb

@@ -9,7 +9,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
   before_action :authorize_read_group!, only: :index
   before_action :find_todos, only: [:index, :destroy_all]
 
-  feature_category :team_planning
+  feature_category :notifications
   urgency :low
 
   def index

app/controllers/import/bulk_imports_controller.rb

@@ -148,6 +148,7 @@ def bulk_import_params
       destination_slug
       destination_namespace
       migrate_projects
+      migrate_memberships
     ]
   end
 

app/controllers/projects/pipelines_controller.rb

@@ -7,7 +7,7 @@ class Projects::PipelinesController < Projects::ApplicationController
 
   urgency :low, [
     :index, :new, :builds, :show, :failures, :create,
-    :stage, :retry, :dag, :cancel, :test_report,
+    :stage, :retry, :cancel, :test_report,
     :charts, :destroy, :status, :manual_variables
   ]
 
@@ -27,7 +27,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   before_action :authorize_cancel_pipeline!, only: [:cancel]
   before_action :ensure_pipeline, only: [:show, :downloadable_artifacts]
   before_action :reject_if_build_artifacts_size_refreshing!, only: [:destroy]
-  before_action only: [:show, :dag, :builds, :failures, :test_report, :manual_variables] do
+  before_action only: [:show, :builds, :failures, :test_report, :manual_variables] do
     push_frontend_feature_flag(:ci_show_manual_variables_in_pipeline, project)
   end
 
@@ -54,7 +54,7 @@ class Projects::PipelinesController < Projects::ApplicationController
 
   feature_category :continuous_integration, [
     :charts, :show, :stage, :cancel, :retry,
-    :builds, :dag, :failures, :status,
+    :builds, :failures, :status,
     :index, :new, :destroy, :manual_variables
   ]
   feature_category :pipeline_composition, [:create]
@@ -144,19 +144,6 @@ def builds
     render_show
   end
 
-  def dag
-    respond_to do |format|
-      format.html do
-        render_show
-      end
-      format.json do
-        render json: Ci::DagPipelineSerializer
-          .new(project: @project, current_user: @current_user)
-          .represent(@pipeline)
-      end
-    end
-  end
-
   def failures
     if @pipeline.failed_builds.present?
       render_show

app/controllers/projects/todos_controller.rb

@@ -6,7 +6,7 @@ class Projects::TodosController < Projects::ApplicationController
 
   before_action :authenticate_user!, only: [:create]
 
-  feature_category :team_planning
+  feature_category :notifications
   urgency :low
 
   private

app/graphql/resolvers/ci/runner_owner_project_resolver.rb

@@ -35,30 +35,21 @@ def resolve_owner
         return unless runner.project_type?
 
         BatchLoader::GraphQL.for(runner.id).batch do |runner_ids, loader|
-          # rubocop: disable CodeReuse/ActiveRecord
-          runner_and_projects_with_row_number =
-            ::Ci::RunnerProject
-              .where(runner_id: runner_ids)
-              .select('id, runner_id, project_id, ROW_NUMBER() OVER (PARTITION BY runner_id ORDER BY id ASC)')
-          runner_and_owner_projects =
-            ::Ci::RunnerProject
-              .select(:id, :runner_id, :project_id)
-              .from("(#{runner_and_projects_with_row_number.to_sql}) temp WHERE row_number = 1")
-          owner_project_id_by_runner_id =
-            runner_and_owner_projects
-              .group_by(&:runner_id)
-              .transform_values { |runner_projects| runner_projects.first.project_id }
-          project_ids = owner_project_id_by_runner_id.values.uniq
+          # rubocop: disable CodeReuse/ActiveRecord -- this runs on a limited number of records
+          runner_id_to_owner_id =
+            ::Ci::Runner.project_type.id_in(runner_ids)
+              .pluck(:id, :sharding_key_id)
+              .to_h
+          # rubocop: enable CodeReuse/ActiveRecord
 
-          projects = apply_lookahead(Project.id_in(project_ids))
+          projects = apply_lookahead(Project.id_in(runner_id_to_owner_id.values))
           Preloaders::ProjectPolicyPreloader.new(projects, current_user).execute
           projects_by_id = projects.index_by(&:id)
 
           runner_ids.each do |runner_id|
-            owner_project_id = owner_project_id_by_runner_id[runner_id]
+            owner_project_id = runner_id_to_owner_id[runner_id]
             loader.call(runner_id, projects_by_id[owner_project_id])
           end
-          # rubocop: enable CodeReuse/ActiveRecord
         end
       end
     end

app/graphql/resolvers/merge_requests_resolver.rb

@@ -160,6 +160,9 @@ def self.accept_reviewer
         as: :assignee_username,
         required: false,
         description: 'Filters merge requests to exclude any that are assigned to the usernames in the given array.'
+      argument :author_username, GraphQL::Types::String,
+        required: false,
+        description: 'Filters merge requests to exclude any that are authored by the given user.'
       argument :labels, [GraphQL::Types::String],
         required: false,
         as: :label_name,

app/graphql/resolvers/package_details_resolver.rb

@@ -12,7 +12,7 @@ class PackageDetailsResolver < BaseResolver
 
     def resolve(id:)
       Gitlab::Graphql::Lazy.with_value(find_object(id: id)) do |package|
-        package if package.default?
+        package if package&.default?
       end
     end
 

app/graphql/types/member_access_level_enum.rb

@@ -5,11 +5,15 @@ class MemberAccessLevelEnum < BaseEnum
     graphql_name 'MemberAccessLevel'
     description 'Access level of a group or project member'
 
-    value 'GUEST', value: Gitlab::Access::GUEST, description: 'Guest access.'
-    value 'REPORTER', value: Gitlab::Access::REPORTER, description: 'Reporter access.'
-    value 'DEVELOPER', value: Gitlab::Access::DEVELOPER, description: 'Developer access.'
-    value 'MAINTAINER', value: Gitlab::Access::MAINTAINER, description: 'Maintainer access.'
-    value 'OWNER', value: Gitlab::Access::OWNER, description: 'Owner access.'
+    def self.descriptions
+      Gitlab::Access.option_descriptions
+    end
+
+    value 'GUEST', value: Gitlab::Access::GUEST, description: descriptions[:guest]
+    value 'REPORTER', value: Gitlab::Access::REPORTER, description: descriptions[:reporter]
+    value 'DEVELOPER', value: Gitlab::Access::DEVELOPER, description: descriptions[:developer]
+    value 'MAINTAINER', value: Gitlab::Access::MAINTAINER, description: descriptions[:maintainer]
+    value 'OWNER', value: Gitlab::Access::OWNER, description: descriptions[:owner]
   end
 end
 

app/graphql/types/permission_types/work_item.rb

@@ -8,7 +8,7 @@ class WorkItem < BasePermissionType
 
       abilities :read_work_item, :update_work_item, :delete_work_item,
         :admin_work_item, :admin_parent_link, :set_work_item_metadata,
-        :create_note, :admin_work_item_link
+        :create_note, :admin_work_item_link, :mark_note_as_internal
     end
   end
 end

app/helpers/application_settings_helper.rb

@@ -502,6 +502,7 @@ def visible_attributes
       :invitation_flow_enforcement,
       :can_create_group,
       :bulk_import_concurrent_pipeline_batch_limit,
+      :concurrent_relation_batch_export_limit,
       :bulk_import_enabled,
       :bulk_import_max_download_file_size,
       :silent_admin_exports_enabled,

app/helpers/icons_helper.rb

@@ -103,9 +103,9 @@ def audit_icon(name, css_class: nil)
   def boolean_to_icon(value)
     if value
       sprite_icon('check',
-        css_class: 'gl-text-green-500') + content_tag(:span, _('Enabled'), class: 'gl-pl-2 gl-text-secondary')
+        css_class: 'gl-text-green-500') + content_tag(:span, _('Enabled'), class: 'gl-pl-2 gl-text-subtle')
     else
-      content_tag(:span, _('Not enabled'), class: 'gl-text-secondary')
+      content_tag(:span, _('Not enabled'), class: 'gl-text-subtle')
     end
   end
 

app/models/application_setting.rb

@@ -530,6 +530,7 @@ def self.kroki_formats_attributes
       :concurrent_bitbucket_import_jobs_limit,
       :concurrent_bitbucket_server_import_jobs_limit,
       :concurrent_github_import_jobs_limit,
+      :concurrent_relation_batch_export_limit,
       :container_registry_token_expire_delay,
       :housekeeping_optimize_repository_period,
       :inactive_projects_delete_after_months,
@@ -623,6 +624,7 @@ def self.kroki_formats_attributes
     concurrent_bitbucket_import_jobs_limit: [:integer, { default: 100 }],
     concurrent_bitbucket_server_import_jobs_limit: [:integer, { default: 100 }],
     concurrent_github_import_jobs_limit: [:integer, { default: 1000 }],
+    concurrent_relation_batch_export_limit: [:integer, { default: 8 }],
     downstream_pipeline_trigger_limit_per_project_user_sha: [:integer, { default: 0 }],
     group_api_limit: [:integer, { default: 400 }],
     group_invited_groups_api_limit: [:integer, { default: 60 }],

app/models/bulk_imports/export_batch.rb

@@ -5,14 +5,21 @@ class ExportBatch < ApplicationRecord
     self.table_name = 'bulk_import_export_batches'
 
     BATCH_SIZE = 1000
+    TIMEOUT_AFTER_START = 1.hour
+    IN_PROGRESS_STATES = %i[created started].freeze
+
+    scope :started_and_not_timed_out, -> { with_status(:started).where(updated_at: TIMEOUT_AFTER_START.ago...) }
 
     belongs_to :export, class_name: 'BulkImports::Export'
     has_one :upload, class_name: 'BulkImports::ExportUpload', foreign_key: :batch_id, inverse_of: :batch
 
     validates :batch_number, presence: true, uniqueness: { scope: :export_id }
 
-    state_machine :status, initial: :started do
-      state :started, value: 0
+    scope :in_progress, -> { with_status(IN_PROGRESS_STATES) }
+
+    state_machine :status, initial: :created do
+      state :created, value: 0
+      state :started, value: 2
       state :finished, value: 1
       state :failed, value: -1
 

app/models/ci/catalog/resource.rb

@@ -24,6 +24,8 @@ class Resource < ::ApplicationRecord
         inverse_of: :catalog_resource
       has_many :sync_events, class_name: 'Ci::Catalog::Resources::SyncEvent', foreign_key: :catalog_resource_id,
         inverse_of: :catalog_resource
+      has_many :component_last_usages, class_name: 'Ci::Catalog::Resources::Components::LastUsage',
+        foreign_key: :catalog_resource_id, inverse_of: :catalog_resource
 
       enum verification_level: VerifiedNamespace::VERIFICATION_LEVELS
 

app/models/ci/catalog/resources/component.rb

@@ -14,6 +14,7 @@ class Component < ::ApplicationRecord
         belongs_to :catalog_resource, class_name: 'Ci::Catalog::Resource', inverse_of: :components
         belongs_to :version, class_name: 'Ci::Catalog::Resources::Version', inverse_of: :components
         has_many :usages, class_name: 'Ci::Catalog::Resources::Components::Usage', inverse_of: :component
+        has_many :last_usages, class_name: 'Ci::Catalog::Resources::Components::LastUsage', inverse_of: :component
 
         # BulkInsertSafe must be included after the `has_many` declaration, otherwise it raises
         # an error about the save callback that is auto generated for this association.

app/models/ci/catalog/resources/components/last_usage.rb

+# frozen_string_literal: true
+
+module Ci
+  module Catalog
+    module Resources
+      module Components
+        class LastUsage < ::ApplicationRecord
+          include EachBatch
+
+          self.table_name = 'catalog_resource_component_last_usages'
+          self.primary_key = :id
+
+          belongs_to :component, class_name: 'Ci::Catalog::Resources::Component', inverse_of: :last_usages
+          belongs_to :catalog_resource, class_name: 'Ci::Catalog::Resource', inverse_of: :component_last_usages
+          belongs_to :component_project, class_name: 'Project', inverse_of: :ci_component_last_usages
+
+          validates :component, :catalog_resource, :component_project, :used_by_project_id, presence: true
+
+          validates :last_used_date, uniqueness: { scope: [:component_id, :used_by_project_id] }, presence: true
+        end
+      end
+    end
+  end
+end

app/models/ci/pipeline_creation/requests.rb

@@ -48,15 +48,10 @@ def start_for_merge_request(merge_request)
           request
         end
 
-        def pipeline_creating_for_merge_request?(merge_request, delete_if_all_complete: false)
+        def pipeline_creating_for_merge_request?(merge_request)
           key = merge_request_key(merge_request)
 
-          requests, _del_result = Gitlab::Redis::SharedState.with do |redis|
-            redis.multi do |transaction|
-              transaction.hvals(key)
-              transaction.del(key) if delete_if_all_complete
-            end
-          end
+          requests = Gitlab::Redis::SharedState.with { |redis| redis.hvals(key) }
 
           return false unless requests.present?
 

app/models/ci/runner.rb

@@ -331,19 +331,18 @@ def self.runner_matchers
     end
 
     def runner_matcher
-      strong_memoize(:runner_matcher) do
-        Gitlab::Ci::Matching::RunnerMatcher.new({
-          runner_ids: [id],
-          runner_type: runner_type,
-          public_projects_minutes_cost_factor: public_projects_minutes_cost_factor,
-          private_projects_minutes_cost_factor: private_projects_minutes_cost_factor,
-          run_untagged: run_untagged,
-          access_level: access_level,
-          tag_list: tag_list,
-          allowed_plan_ids: allowed_plan_ids
-        })
-      end
-    end
+      Gitlab::Ci::Matching::RunnerMatcher.new({
+        runner_ids: [id],
+        runner_type: runner_type,
+        public_projects_minutes_cost_factor: public_projects_minutes_cost_factor,
+        private_projects_minutes_cost_factor: private_projects_minutes_cost_factor,
+        run_untagged: run_untagged,
+        access_level: access_level,
+        tag_list: tag_list,
+        allowed_plan_ids: allowed_plan_ids
+      })
+    end
+    strong_memoize_attr :runner_matcher
 
     def assign_to(project, current_user = nil)
       if instance_type?
@@ -354,7 +353,11 @@ def assign_to(project, current_user = nil)
 
       begin
         transaction do
-          self.sharding_key_id = project.id if self.runner_projects.empty?
+          if self.runner_projects.empty?
+            self.sharding_key_id = project.id
+            self.clear_memoization(:owner)
+          end
+
           self.runner_projects << ::Ci::RunnerProject.new(project: project, runner: self)
           self.save!
         end
@@ -384,14 +387,20 @@ def deprecated_rest_status
       end
     end
 
-    def owner_project
-      return unless project_type?
-
-      runner_projects.order(:id).first&.project
+    def owner
+      case runner_type
+      when 'instance_type'
+        ::User.find_by_id(creator_id)
+      when 'group_type'
+        ::Group.find_by_id(sharding_key_id)
+      when 'project_type'
+        ::Project.find_by_id(sharding_key_id)
+      end
     end
+    strong_memoize_attr :owner
 
     def belongs_to_one_project?
-      runner_projects.count == 1
+      runner_projects.limit(2).count(:all) == 1
     end
 
     def belongs_to_more_than_one_project?
@@ -497,10 +506,9 @@ def uncached_contacted_at
     end
 
     def namespace_ids
-      strong_memoize(:namespace_ids) do
-        runner_namespaces.pluck(:namespace_id).compact
-      end
+      runner_namespaces.pluck(:namespace_id).compact
     end
+    strong_memoize_attr :namespace_ids
 
     def compute_token_expiration
       case runner_type