Automatic merge of gitlab-org/gitlab master

cea7765c · GitLab Bot · 4eb8816d · 4ecc55da · cea7765c · cea7765c
Commit cea7765c authored Aug 31, 2021 by GitLab Bot
176 changed files
--- a/app/assets/javascripts/experimentation/utils.js
+++ b/app/assets/javascripts/experimentation/utils.js
 // This file only applies to use of experiments through https://gitlab.com/gitlab-org/gitlab-experiment
-import { get } from 'lodash';
+import { get, pick } from 'lodash';
 import { DEFAULT_VARIANT, CANDIDATE_VARIANT, TRACKING_CONTEXT_SCHEMA } from './constants';
+function getExperimentsData() {
+  return get(window, ['gon', 'experiment'], {});
+}
+function convertExperimentDataToExperimentContext(experimentData) {
+  return { schema: TRACKING_CONTEXT_SCHEMA, data: experimentData };
+}
 export function getExperimentData(experimentName) {
-  return get(window, ['gon', 'experiment', experimentName]);
+  return getExperimentsData()[experimentName];
 }
 export function getExperimentContexts(...experimentNames) {
-  return experimentNames
+  return Object.values(pick(getExperimentsData(), experimentNames)).map(
-    .map((name) => {
+    convertExperimentDataToExperimentContext,
-      const data = getExperimentData(name);
+  );
-      return data && { schema: TRACKING_CONTEXT_SCHEMA, data };
+}
-    })
-    .filter((context) => context);
+export function getAllExperimentContexts() {
+  return Object.values(getExperimentsData()).map(convertExperimentDataToExperimentContext);
 }
 export function isExperimentVariant(experimentName, variantName) {

--- a/app/assets/javascripts/tracking/index.js
+++ b/app/assets/javascripts/tracking/index.js
+import { getAllExperimentContexts } from '~/experimentation/utils';
 import { DEFAULT_SNOWPLOW_OPTIONS } from './constants';
 import getStandardContext from './get_standard_context';
 import Tracking from './tracking';
@@ -41,7 +42,8 @@ export function initDefaultTrackers() {
  window.snowplow('enableActivityTracking', 30, 30);
  // must be after enableActivityTracking
  const standardContext = getStandardContext();
-  window.snowplow('trackPageView', null, [standardContext]);
+  const experimentContexts = getAllExperimentContexts();
+  window.snowplow('trackPageView', null, [standardContext, ...experimentContexts]);
  if (window.snowplowOptions.formTracking) {
    Tracking.enableFormTracking(opts.formTrackingConfig);

--- a/app/graphql/types/base_field.rb
+++ b/app/graphql/types/base_field.rb
@@ -9,6 +9,7 @@ module Types
    DEFAULT_COMPLEXITY = 1
    attr_reader :deprecation, :doc_reference
+    attr_writer :max_page_size # Can be removed with :performance_roadmap feature flag: https://gitlab.com/gitlab-org/gitlab/-/issues/337198
    def initialize(**kwargs, &block)
      @calls_gitaly = !!kwargs.delete(:calls_gitaly)

--- a/app/models/concerns/integrations/has_data_fields.rb
+++ b/app/models/concerns/integrations/has_data_fields.rb
@@ -46,6 +46,7 @@ module Integrations
      has_one :issue_tracker_data, autosave: true, inverse_of: :integration, foreign_key: :service_id, class_name: 'Integrations::IssueTrackerData'
      has_one :jira_tracker_data, autosave: true, inverse_of: :integration, foreign_key: :service_id, class_name: 'Integrations::JiraTrackerData'
      has_one :open_project_tracker_data, autosave: true, inverse_of: :integration, foreign_key: :service_id, class_name: 'Integrations::OpenProjectTrackerData'
+      has_one :zentao_tracker_data, autosave: true, inverse_of: :integration, foreign_key: :integration_id, class_name: 'Integrations::ZentaoTrackerData'
      def data_fields
        raise NotImplementedError

--- a/app/models/integrations/zentao.rb
+++ b/app/models/integrations/zentao.rb
+# frozen_string_literal: true
+module Integrations
+  class Zentao < Integration
+    data_field :url, :api_url, :api_token, :zentao_product_xid
+    validates :url, public_url: true, presence: true, if: :activated?
+    validates :api_url, public_url: true, allow_blank: true
+    validates :api_token, presence: true, if: :activated?
+    validates :zentao_product_xid, presence: true, if: :activated?
+    def data_fields
+      zentao_tracker_data || self.build_zentao_tracker_data
+    end
+    def title
+      self.class.name.demodulize
+    end
+    def description
+      s_("ZentaoIntegration|Use Zentao as this project's issue tracker.")
+    end
+    def self.to_param
+      name.demodulize.downcase
+    end
+    def test(*_args)
+      client.ping
+    end
+    def self.supported_events
+      %w()
+    end
+    def self.supported_event_actions
+      %w()
+    end
+    def fields
+      [
+        {
+          type: 'text',
+          name: 'url',
+          title: s_('ZentaoIntegration|Zentao Web URL'),
+          placeholder: 'https://www.zentao.net',
+          help: s_('ZentaoIntegration|Base URL of the Zentao instance.'),
+          required: true
+        },
+        {
+          type: 'text',
+          name: 'api_url',
+          title: s_('ZentaoIntegration|Zentao API URL (optional)'),
+          help: s_('ZentaoIntegration|If different from Web URL.')
+        },
+        {
+          type: 'password',
+          name: 'api_token',
+          title: s_('ZentaoIntegration|Zentao API token'),
+          non_empty_password_title: s_('ZentaoIntegration|Enter API token'),
+          required: true
+        },
+        {
+          type: 'text',
+          name: 'zentao_product_xid',
+          title: s_('ZentaoIntegration|Zentao Product ID'),
+          required: true
+        }
+      ]
+    end
+    private
+    def client
+      @client ||= ::Gitlab::Zentao::Client.new(self)
+    end
+  end
+end
--- a/app/models/integrations/zentao_tracker_data.rb
+++ b/app/models/integrations/zentao_tracker_data.rb
+# frozen_string_literal: true
+module Integrations
+  class ZentaoTrackerData < ApplicationRecord
+    belongs_to :integration, inverse_of: :zentao_tracker_data, foreign_key: :integration_id
+    delegate :activated?, to: :integration
+    validates :integration, presence: true
+    scope :encryption_options, -> do
+      {
+        key: Settings.attr_encrypted_db_key_base_32,
+        encode: true,
+        mode: :per_attribute_iv,
+        algorithm: 'aes-256-gcm'
+      }
+    end
+    attr_encrypted :url, encryption_options
+    attr_encrypted :api_url, encryption_options
+    attr_encrypted :zentao_product_xid, encryption_options
+    attr_encrypted :api_token, encryption_options
+  end
+end
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -209,6 +209,7 @@ class Project < ApplicationRecord
  has_one :unify_circuit_integration, class_name: 'Integrations::UnifyCircuit'
  has_one :webex_teams_integration, class_name: 'Integrations::WebexTeams'
  has_one :youtrack_integration, class_name: 'Integrations::Youtrack'
+  has_one :zentao_integration, class_name: 'Integrations::Zentao'
  has_one :root_of_fork_network,
          foreign_key: 'root_project_id',
@@ -1455,7 +1456,7 @@ class Project < ApplicationRecord
  end
  def disabled_integrations
-    []
+    [:zentao]
  end
  def find_or_initialize_integration(name)

--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
--- a/app/workers/analytics/usage_trends/count_job_trigger_worker.rb
+++ b/app/workers/analytics/usage_trends/count_job_trigger_worker.rb
@@ -13,7 +13,6 @@ module Analytics
      DEFAULT_DELAY = 3.minutes.freeze
      feature_category :devops_reports
-      tags :exclude_from_kubernetes
      urgency :low
      idempotent!

--- a/app/workers/analytics/usage_trends/counter_job_worker.rb
+++ b/app/workers/analytics/usage_trends/counter_job_worker.rb
@@ -12,7 +12,6 @@ module Analytics
      feature_category :devops_reports
      urgency :low
-      tags :exclude_from_kubernetes
      idempotent!

--- a/app/workers/approve_blocked_pending_approval_users_worker.rb
+++ b/app/workers/approve_blocked_pending_approval_users_worker.rb
@@ -10,7 +10,6 @@ class ApproveBlockedPendingApprovalUsersWorker
  idempotent!
  feature_category :users
-  tags :exclude_from_kubernetes
  def perform(current_user_id)
    current_user = User.find(current_user_id)

--- a/app/workers/bulk_import_worker.rb
+++ b/app/workers/bulk_import_worker.rb
@@ -6,7 +6,6 @@ class BulkImportWorker # rubocop:disable Scalability/IdempotentWorker
  data_consistency :always
  feature_category :importers
-  tags :exclude_from_kubernetes
  sidekiq_options retry: false, dead: false

--- a/app/workers/bulk_imports/entity_worker.rb
+++ b/app/workers/bulk_imports/entity_worker.rb
@@ -7,7 +7,6 @@ module BulkImports
    data_consistency :always
    feature_category :importers
-    tags :exclude_from_kubernetes
    sidekiq_options retry: false, dead: false

--- a/app/workers/bulk_imports/pipeline_worker.rb
+++ b/app/workers/bulk_imports/pipeline_worker.rb
@@ -9,7 +9,6 @@ module BulkImports
    NDJSON_PIPELINE_PERFORM_DELAY = 1.minute
    feature_category :importers
-    tags :exclude_from_kubernetes
    sidekiq_options retry: false, dead: false

--- a/app/workers/bulk_imports/relation_export_worker.rb
+++ b/app/workers/bulk_imports/relation_export_worker.rb
@@ -10,7 +10,6 @@ module BulkImports
    idempotent!
    loggable_arguments 2, 3
    feature_category :importers
-    tags :exclude_from_kubernetes
    sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION
    def perform(user_id, portable_id, portable_class, relation)

--- a/app/workers/ci/delete_objects_worker.rb
+++ b/app/workers/ci/delete_objects_worker.rb
@@ -10,7 +10,6 @@ module Ci
    include LimitedCapacity::Worker
    feature_category :continuous_integration
-    tags :exclude_from_kubernetes
    idempotent!
    def perform_work(*args)

--- a/app/workers/ci/drop_pipeline_worker.rb
+++ b/app/workers/ci/drop_pipeline_worker.rb
@@ -9,8 +9,6 @@ module Ci
    sidekiq_options retry: 3
    include PipelineQueue
-    tags :exclude_from_kubernetes
    idempotent!
    def perform(pipeline_id, failure_reason)

--- a/app/workers/ci/merge_requests/add_todo_when_build_fails_worker.rb
+++ b/app/workers/ci/merge_requests/add_todo_when_build_fails_worker.rb
@@ -10,7 +10,6 @@ module Ci
      include PipelineQueue
      urgency :low
-      tags :exclude_from_kubernetes
      idempotent!
      def perform(job_id)

--- a/app/workers/ci/pipeline_artifacts/create_quality_report_worker.rb
+++ b/app/workers/ci/pipeline_artifacts/create_quality_report_worker.rb
@@ -11,7 +11,6 @@ module Ci
      queue_namespace :pipeline_background
      feature_category :code_testing
-      tags :exclude_from_kubernetes
      idempotent!

--- a/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb
+++ b/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb
@@ -15,7 +15,6 @@ module Ci
      deduplicate :until_executed, including_scheduled: true
      idempotent!
      feature_category :continuous_integration
-      tags :exclude_from_kubernetes
      def perform
        service = ::Ci::PipelineArtifacts::DestroyAllExpiredService.new

--- a/app/workers/ci/schedule_delete_objects_cron_worker.rb
+++ b/app/workers/ci/schedule_delete_objects_cron_worker.rb
@@ -12,7 +12,6 @@ module Ci
    # rubocop:enable Scalability/CronWorkerContext
    feature_category :continuous_integration
-    tags :exclude_from_kubernetes
    idempotent!
    def perform(*args)

--- a/app/workers/ci/test_failure_history_worker.rb
+++ b/app/workers/ci/test_failure_history_worker.rb
@@ -9,8 +9,6 @@ module Ci
    sidekiq_options retry: 3
    include PipelineBackgroundQueue
-    tags :exclude_from_kubernetes
    idempotent!
    def perform(pipeline_id)

--- a/app/workers/concerns/chaos_queue.rb
+++ b/app/workers/concerns/chaos_queue.rb
@@ -6,6 +6,5 @@ module ChaosQueue
  included do
    queue_namespace :chaos
    feature_category_not_owned!
-    tags :exclude_from_gitlab_com
  end
 end
--- a/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb
+++ b/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb
@@ -12,7 +12,6 @@ module ContainerExpirationPolicies
    queue_namespace :container_repository
    feature_category :container_registry
-    tags :exclude_from_kubernetes
    urgency :low
    worker_resource_boundary :unknown
    idempotent!

--- a/app/workers/database/batched_background_migration_worker.rb
+++ b/app/workers/database/batched_background_migration_worker.rb
@@ -9,7 +9,6 @@ module Database
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
    feature_category :database
-    tags :exclude_from_kubernetes
    idempotent!
    LEASE_TIMEOUT_MULTIPLIER = 3

--- a/app/workers/deployments/drop_older_deployments_worker.rb
+++ b/app/workers/deployments/drop_older_deployments_worker.rb
@@ -10,7 +10,6 @@ module Deployments
    queue_namespace :deployment
    feature_category :continuous_delivery
-    tags :exclude_from_kubernetes
    def perform(deployment_id)
      Deployments::OlderDeploymentsDropService.new(deployment_id).execute

--- a/app/workers/design_management/copy_design_collection_worker.rb
+++ b/app/workers/design_management/copy_design_collection_worker.rb
@@ -9,7 +9,6 @@ module DesignManagement
    sidekiq_options retry: 3
    feature_category :design_management
-    tags :exclude_from_kubernetes
    idempotent!
    urgency :low

--- a/app/workers/destroy_pages_deployments_worker.rb
+++ b/app/workers/destroy_pages_deployments_worker.rb
@@ -10,7 +10,6 @@ class DestroyPagesDeploymentsWorker
  loggable_arguments 0, 1
  sidekiq_options retry: 3
  feature_category :pages
-  tags :exclude_from_kubernetes
  def perform(project_id, last_deployment_id = nil)
    project = Project.find_by_id(project_id)

--- a/app/workers/disallow_two_factor_for_group_worker.rb
+++ b/app/workers/disallow_two_factor_for_group_worker.rb
@@ -9,7 +9,6 @@ class DisallowTwoFactorForGroupWorker
  include ExceptionBacktrace
  feature_category :subgroups
-  tags :exclude_from_kubernetes
  idempotent!
  def perform(group_id)

--- a/app/workers/disallow_two_factor_for_subgroups_worker.rb
+++ b/app/workers/disallow_two_factor_for_subgroups_worker.rb
@@ -11,7 +11,6 @@ class DisallowTwoFactorForSubgroupsWorker
  INTERVAL = 2.seconds.to_i
  feature_category :subgroups
-  tags :exclude_from_kubernetes
  idempotent!
  def perform(group_id)

--- a/app/workers/environments/canary_ingress/update_worker.rb
+++ b/app/workers/environments/canary_ingress/update_worker.rb
@@ -11,7 +11,6 @@ module Environments
      idempotent!
      worker_has_external_dependencies!
      feature_category :continuous_delivery
-      tags :exclude_from_kubernetes
      def perform(environment_id, params)
        Environment.find_by_id(environment_id).try do |environment|

--- a/app/workers/experiments/record_conversion_event_worker.rb
+++ b/app/workers/experiments/record_conversion_event_worker.rb
@@ -9,7 +9,6 @@ module Experiments
    sidekiq_options retry: 3
    feature_category :users
-    tags :exclude_from_kubernetes
    urgency :low
    idempotent!

--- a/app/workers/flush_counter_increments_worker.rb
+++ b/app/workers/flush_counter_increments_worker.rb
@@ -13,7 +13,6 @@ class FlushCounterIncrementsWorker
  sidekiq_options retry: 3
  feature_category_not_owned!
-  tags :exclude_from_kubernetes
  urgency :low
  deduplicate :until_executing, including_scheduled: true

--- a/app/workers/gitlab/github_import/import_pull_request_merged_by_worker.rb
+++ b/app/workers/gitlab/github_import/import_pull_request_merged_by_worker.rb
@@ -5,7 +5,6 @@ module Gitlab
    class ImportPullRequestMergedByWorker # rubocop:disable Scalability/IdempotentWorker
      include ObjectImporter
-      tags :exclude_from_kubernetes
      worker_resource_boundary :cpu
      def representation_class

--- a/app/workers/gitlab/github_import/import_pull_request_review_worker.rb
+++ b/app/workers/gitlab/github_import/import_pull_request_review_worker.rb
@@ -5,7 +5,6 @@ module Gitlab
    class ImportPullRequestReviewWorker # rubocop:disable Scalability/IdempotentWorker
      include ObjectImporter
-      tags :exclude_from_kubernetes
      worker_resource_boundary :cpu
      def representation_class

--- a/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb
+++ b/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb
@@ -12,8 +12,6 @@ module Gitlab
        include GithubImport::Queue
        include StageMethods
-        tags :exclude_from_kubernetes
        # client - An instance of Gitlab::GithubImport::Client.
        # project - An instance of Project.
        def import(client, project)

--- a/app/workers/gitlab/github_import/stage/import_pull_requests_reviews_worker.rb
+++ b/app/workers/gitlab/github_import/stage/import_pull_requests_reviews_worker.rb
@@ -12,8 +12,6 @@ module Gitlab
        include GithubImport::Queue
        include StageMethods
-        tags :exclude_from_kubernetes
        # client - An instance of Gitlab::GithubImport::Client.
        # project - An instance of Project.
        def import(client, project)

--- a/app/workers/gitlab_performance_bar_stats_worker.rb
+++ b/app/workers/gitlab_performance_bar_stats_worker.rb
@@ -15,7 +15,6 @@ class GitlabPerformanceBarStatsWorker
  STATS_KEY_EXPIRE = 30.minutes.to_i
  feature_category :metrics
-  tags :exclude_from_kubernetes
  idempotent!
  def perform(lease_uuid)

--- a/app/workers/group_destroy_worker.rb
+++ b/app/workers/group_destroy_worker.rb
@@ -9,7 +9,6 @@ class GroupDestroyWorker # rubocop:disable Scalability/IdempotentWorker
  include ExceptionBacktrace
  feature_category :subgroups
-  tags :requires_disk_io, :exclude_from_kubernetes
  def perform(group_id, user_id)
    begin

--- a/app/workers/hashed_storage/migrator_worker.rb
+++ b/app/workers/hashed_storage/migrator_worker.rb
@@ -13,7 +13,7 @@ module HashedStorage
    # Gitlab::HashedStorage::Migrator#migration_pending? depends on the
    # queue size of this worker.
-    tags :exclude_from_gitlab_com, :needs_own_queue
+    tags :needs_own_queue
    # @param [Integer] start initial ID of the batch
    # @param [Integer] finish last ID of the batch

--- a/app/workers/hashed_storage/project_migrate_worker.rb
+++ b/app/workers/hashed_storage/project_migrate_worker.rb
@@ -13,7 +13,7 @@ module HashedStorage
    # Gitlab::HashedStorage::Migrator#migration_pending? depends on the
    # queue size of this worker.
-    tags :exclude_from_gitlab_com, :needs_own_queue
+    tags :needs_own_queue
    attr_reader :project_id

--- a/app/workers/hashed_storage/project_rollback_worker.rb
+++ b/app/workers/hashed_storage/project_rollback_worker.rb
@@ -13,7 +13,7 @@ module HashedStorage
    # Gitlab::HashedStorage::Migrator#rollback_pending? depends on the
    # queue size of this worker.
-    tags :exclude_from_gitlab_com, :needs_own_queue
+    tags :needs_own_queue
    attr_reader :project_id

--- a/app/workers/hashed_storage/rollbacker_worker.rb
+++ b/app/workers/hashed_storage/rollbacker_worker.rb
@@ -13,7 +13,7 @@ module HashedStorage
    # Gitlab::HashedStorage::Migrator#rollback_pending? depends on the
    # queue size of this worker.
-    tags :exclude_from_gitlab_com, :needs_own_queue
+    tags :needs_own_queue
    # @param [Integer] start initial ID of the batch
    # @param [Integer] finish last ID of the batch

--- a/app/workers/incident_management/add_severity_system_note_worker.rb
+++ b/app/workers/incident_management/add_severity_system_note_worker.rb
@@ -11,7 +11,6 @@ module IncidentManagement
    queue_namespace :incident_management
    feature_category :incident_management
-    tags :exclude_from_kubernetes
    def perform(incident_id, user_id)
      return if incident_id.blank? || user_id.blank?

--- a/app/workers/issue_rebalancing_worker.rb
+++ b/app/workers/issue_rebalancing_worker.rb
@@ -10,7 +10,6 @@ class IssueRebalancingWorker
  idempotent!
  urgency :low
  feature_category :issue_tracking
-  tags :exclude_from_kubernetes
  deduplicate :until_executed, including_scheduled: true
  def perform(ignore = nil, project_id = nil, root_namespace_id = nil)

--- a/app/workers/jira_connect/sync_builds_worker.rb
+++ b/app/workers/jira_connect/sync_builds_worker.rb
@@ -8,7 +8,6 @@ module JiraConnect
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
-    tags :exclude_from_kubernetes
    urgency :low
    worker_has_external_dependencies!

--- a/app/workers/jira_connect/sync_deployments_worker.rb
+++ b/app/workers/jira_connect/sync_deployments_worker.rb
@@ -8,7 +8,6 @@ module JiraConnect
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
-    tags :exclude_from_kubernetes
    urgency :low
    worker_has_external_dependencies!

--- a/app/workers/jira_connect/sync_feature_flags_worker.rb
+++ b/app/workers/jira_connect/sync_feature_flags_worker.rb
@@ -8,7 +8,6 @@ module JiraConnect
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
-    tags :exclude_from_kubernetes
    urgency :low
    worker_has_external_dependencies!

--- a/app/workers/jira_connect/sync_project_worker.rb
+++ b/app/workers/jira_connect/sync_project_worker.rb
@@ -8,7 +8,6 @@ module JiraConnect
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
-    tags :exclude_from_kubernetes
    urgency :low
    worker_has_external_dependencies!

--- a/app/workers/member_invitation_reminder_emails_worker.rb
+++ b/app/workers/member_invitation_reminder_emails_worker.rb
@@ -8,7 +8,6 @@ class MemberInvitationReminderEmailsWorker # rubocop:disable Scalability/Idempot
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
  feature_category :subgroups
-  tags :exclude_from_kubernetes
  urgency :low
  def perform

--- a/app/workers/merge_request_cleanup_refs_worker.rb
+++ b/app/workers/merge_request_cleanup_refs_worker.rb
@@ -10,7 +10,6 @@ class MergeRequestCleanupRefsWorker
  sidekiq_options retry: 3
  feature_category :code_review
-  tags :exclude_from_kubernetes
  idempotent!
  # Hard-coded to 4 for now. Will be configurable later on via application settings.

--- a/app/workers/metrics/dashboard/sync_dashboards_worker.rb
+++ b/app/workers/metrics/dashboard/sync_dashboards_worker.rb
@@ -10,7 +10,6 @@ module Metrics
      sidekiq_options retry: 3
      feature_category :metrics
-      tags :exclude_from_kubernetes
      idempotent!

--- a/app/workers/namespaces/in_product_marketing_emails_worker.rb
+++ b/app/workers/namespaces/in_product_marketing_emails_worker.rb
@@ -9,7 +9,6 @@ module Namespaces
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
    feature_category :subgroups
-    tags :exclude_from_kubernetes
    urgency :low
    def perform

--- a/app/workers/namespaces/onboarding_issue_created_worker.rb
+++ b/app/workers/namespaces/onboarding_issue_created_worker.rb
@@ -9,7 +9,6 @@ module Namespaces
    sidekiq_options retry: 3
    feature_category :issue_tracking
-    tags :exclude_from_kubernetes
    urgency :low
    deduplicate :until_executing

--- a/app/workers/namespaces/onboarding_pipeline_created_worker.rb
+++ b/app/workers/namespaces/onboarding_pipeline_created_worker.rb
@@ -9,7 +9,6 @@ module Namespaces
    sidekiq_options retry: 3
    feature_category :subgroups
-    tags :exclude_from_kubernetes
    urgency :low
    deduplicate :until_executing

--- a/app/workers/namespaces/onboarding_progress_worker.rb
+++ b/app/workers/namespaces/onboarding_progress_worker.rb
@@ -10,7 +10,6 @@ module Namespaces
    feature_category :product_analytics
    worker_resource_boundary :cpu
-    tags :exclude_from_kubernetes
    urgency :low
    deduplicate :until_executed

--- a/app/workers/namespaces/onboarding_user_added_worker.rb
+++ b/app/workers/namespaces/onboarding_user_added_worker.rb
@@ -9,7 +9,6 @@ module Namespaces
    sidekiq_options retry: 3
    feature_category :users
-    tags :exclude_from_kubernetes
    urgency :low
    idempotent!

--- a/app/workers/packages/composer/cache_cleanup_worker.rb
+++ b/app/workers/packages/composer/cache_cleanup_worker.rb
@@ -10,7 +10,6 @@ module Packages
      include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
      feature_category :package_registry
-      tags :exclude_from_kubernetes
      idempotent!

--- a/app/workers/packages/composer/cache_update_worker.rb
+++ b/app/workers/packages/composer/cache_update_worker.rb
@@ -10,7 +10,6 @@ module Packages
      sidekiq_options retry: 3
      feature_category :package_registry
-      tags :exclude_from_kubernetes
      idempotent!

--- a/app/workers/packages/debian/process_changes_worker.rb
+++ b/app/workers/packages/debian/process_changes_worker.rb
@@ -13,7 +13,6 @@ module Packages
      queue_namespace :package_repositories
      feature_category :package_registry
-      tags :exclude_from_kubernetes
      def perform(package_file_id, user_id)
        @package_file_id = package_file_id

--- a/app/workers/packages/go/sync_packages_worker.rb
+++ b/app/workers/packages/go/sync_packages_worker.rb
@@ -12,7 +12,6 @@ module Packages
      queue_namespace :package_repositories
      feature_category :package_registry
-      tags :exclude_from_kubernetes
      deduplicate :until_executing
      idempotent!

--- a/app/workers/packages/maven/metadata/sync_worker.rb
+++ b/app/workers/packages/maven/metadata/sync_worker.rb
@@ -13,7 +13,6 @@ module Packages
        queue_namespace :package_repositories
        feature_category :package_registry
-        tags :exclude_from_kubernetes
        deduplicate :until_executing
        idempotent!

--- a/app/workers/packages/rubygems/extraction_worker.rb
+++ b/app/workers/packages/rubygems/extraction_worker.rb
@@ -11,7 +11,6 @@ module Packages
      queue_namespace :package_repositories
      feature_category :package_registry
-      tags :exclude_from_kubernetes
      deduplicate :until_executing
      def perform(package_file_id)

--- a/app/workers/pages_domain_ssl_renewal_worker.rb
+++ b/app/workers/pages_domain_ssl_renewal_worker.rb
@@ -8,7 +8,6 @@ class PagesDomainSslRenewalWorker # rubocop:disable Scalability/IdempotentWorker
  sidekiq_options retry: 3
  feature_category :pages
-  tags :requires_disk_io, :exclude_from_kubernetes
  def perform(domain_id)
    domain = PagesDomain.find_by_id(domain_id)

--- a/app/workers/pages_domain_verification_worker.rb
+++ b/app/workers/pages_domain_verification_worker.rb
@@ -8,7 +8,6 @@ class PagesDomainVerificationWorker # rubocop:disable Scalability/IdempotentWork
  sidekiq_options retry: 3
  feature_category :pages
-  tags :requires_disk_io, :exclude_from_kubernetes
  # rubocop: disable CodeReuse/ActiveRecord
  def perform(domain_id)

--- a/app/workers/pages_remove_worker.rb
+++ b/app/workers/pages_remove_worker.rb
@@ -8,7 +8,6 @@ class PagesRemoveWorker # rubocop:disable Scalability/IdempotentWorker
  sidekiq_options retry: 3
  feature_category :pages
-  tags :exclude_from_kubernetes
  loggable_arguments 0
  def perform(project_id)

--- a/app/workers/pages_transfer_worker.rb
+++ b/app/workers/pages_transfer_worker.rb
@@ -10,7 +10,6 @@ class PagesTransferWorker # rubocop:disable Scalability/IdempotentWorker
  TransferFailedError = Class.new(StandardError)
  feature_category :pages
-  tags :exclude_from_kubernetes
  loggable_arguments 0, 1
  def perform(method, args)

--- a/app/workers/pages_update_configuration_worker.rb
+++ b/app/workers/pages_update_configuration_worker.rb
@@ -9,7 +9,6 @@ class PagesUpdateConfigurationWorker
  idempotent!
  feature_category :pages
-  tags :exclude_from_kubernetes
  def self.perform_async(*args)
    return unless ::Settings.pages.local_store.enabled

--- a/app/workers/pages_worker.rb
+++ b/app/workers/pages_worker.rb
@@ -8,7 +8,6 @@ class PagesWorker # rubocop:disable Scalability/IdempotentWorker
  sidekiq_options retry: 3
  feature_category :pages
  loggable_arguments 0, 1
-  tags :requires_disk_io, :exclude_from_kubernetes
  worker_resource_boundary :cpu
  def perform(action, *arg)

--- a/app/workers/personal_access_tokens/expired_notification_worker.rb
+++ b/app/workers/personal_access_tokens/expired_notification_worker.rb
@@ -9,7 +9,6 @@ module PersonalAccessTokens
    include CronjobQueue
    feature_category :authentication_and_authorization
-    tags :exclude_from_kubernetes
    def perform(*args)
      notification_service = NotificationService.new

--- a/app/workers/project_destroy_worker.rb
+++ b/app/workers/project_destroy_worker.rb
@@ -9,7 +9,6 @@ class ProjectDestroyWorker # rubocop:disable Scalability/IdempotentWorker
  include ExceptionBacktrace
  feature_category :source_code_management
-  tags :requires_disk_io, :exclude_from_kubernetes
  def perform(project_id, user_id, params)
    project = Project.find(project_id)

--- a/app/workers/projects/git_garbage_collect_worker.rb
+++ b/app/workers/projects/git_garbage_collect_worker.rb
@@ -5,8 +5,6 @@ module Projects
    extend ::Gitlab::Utils::Override
    include GitGarbageCollectMethods
-    tags :exclude_from_kubernetes
    private
    override :find_resource

--- a/app/workers/projects/post_creation_worker.rb
+++ b/app/workers/projects/post_creation_worker.rb
@@ -9,7 +9,6 @@ module Projects
    sidekiq_options retry: 3
    feature_category :source_code_management
-    tags :exclude_from_kubernetes
    idempotent!
    def perform(project_id)

--- a/app/workers/propagate_integration_group_worker.rb
+++ b/app/workers/propagate_integration_group_worker.rb
@@ -6,7 +6,6 @@ class PropagateIntegrationGroupWorker
  data_consistency :always
  sidekiq_options retry: 3
  feature_category :integrations
-  tags :exclude_from_kubernetes
  urgency :low
  idempotent!

--- a/app/workers/propagate_integration_inherit_descendant_worker.rb
+++ b/app/workers/propagate_integration_inherit_descendant_worker.rb
@@ -6,7 +6,6 @@ class PropagateIntegrationInheritDescendantWorker
  data_consistency :always
  sidekiq_options retry: 3
  feature_category :integrations
-  tags :exclude_from_kubernetes
  urgency :low
  idempotent!

--- a/app/workers/propagate_integration_inherit_worker.rb
+++ b/app/workers/propagate_integration_inherit_worker.rb
@@ -6,7 +6,6 @@ class PropagateIntegrationInheritWorker
  data_consistency :always
  sidekiq_options retry: 3
  feature_category :integrations
-  tags :exclude_from_kubernetes
  urgency :low
  idempotent!

--- a/app/workers/propagate_integration_project_worker.rb
+++ b/app/workers/propagate_integration_project_worker.rb
@@ -6,7 +6,6 @@ class PropagateIntegrationProjectWorker
  data_consistency :always
  sidekiq_options retry: 3
  feature_category :integrations
-  tags :exclude_from_kubernetes
  urgency :low
  idempotent!

--- a/app/workers/releases/create_evidence_worker.rb
+++ b/app/workers/releases/create_evidence_worker.rb
@@ -9,7 +9,6 @@ module Releases
    sidekiq_options retry: 3
    feature_category :release_evidence
-    tags :exclude_from_kubernetes
    # pipeline_id is optional for backward compatibility with existing jobs
    # caller should always try to provide the pipeline and pass nil only

--- a/app/workers/releases/manage_evidence_worker.rb
+++ b/app/workers/releases/manage_evidence_worker.rb
@@ -9,7 +9,6 @@ module Releases
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
    feature_category :release_evidence
-    tags :exclude_from_kubernetes
    def perform
      releases = Release.without_evidence.released_within_2hrs

--- a/app/workers/remove_unaccepted_member_invites_worker.rb
+++ b/app/workers/remove_unaccepted_member_invites_worker.rb
@@ -8,7 +8,6 @@ class RemoveUnacceptedMemberInvitesWorker # rubocop:disable Scalability/Idempote
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
  feature_category :authentication_and_authorization
-  tags :exclude_from_kubernetes
  urgency :low
  idempotent!

--- a/app/workers/schedule_merge_request_cleanup_refs_worker.rb
+++ b/app/workers/schedule_merge_request_cleanup_refs_worker.rb
@@ -8,7 +8,6 @@ class ScheduleMergeRequestCleanupRefsWorker
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
  feature_category :code_review
-  tags :exclude_from_kubernetes
  idempotent!
  def perform

--- a/app/workers/ssh_keys/expired_notification_worker.rb
+++ b/app/workers/ssh_keys/expired_notification_worker.rb
@@ -9,7 +9,6 @@ module SshKeys
    include CronjobQueue
    feature_category :compliance_management
-    tags :exclude_from_kubernetes
    idempotent!
    BATCH_SIZE = 500

--- a/app/workers/ssh_keys/expiring_soon_notification_worker.rb
+++ b/app/workers/ssh_keys/expiring_soon_notification_worker.rb
@@ -9,7 +9,6 @@ module SshKeys
    include CronjobQueue
    feature_category :compliance_management
-    tags :exclude_from_kubernetes
    idempotent!
    def perform

--- a/app/workers/todos_destroyer/destroyed_issuable_worker.rb
+++ b/app/workers/todos_destroyer/destroyed_issuable_worker.rb
@@ -9,8 +9,6 @@ module TodosDestroyer
    sidekiq_options retry: 3
    include TodosDestroyerQueue
-    tags :exclude_from_kubernetes
    idempotent!
    def perform(target_id, target_type)

--- a/app/workers/user_status_cleanup/batch_worker.rb
+++ b/app/workers/user_status_cleanup/batch_worker.rb
@@ -12,7 +12,6 @@ module UserStatusCleanup
    # rubocop:enable Scalability/CronWorkerContext
    feature_category :users
-    tags :exclude_from_kubernetes
    idempotent!

--- a/app/workers/users/deactivate_dormant_users_worker.rb
+++ b/app/workers/users/deactivate_dormant_users_worker.rb
@@ -9,7 +9,6 @@ module Users
    include CronjobQueue
    feature_category :utilization
-    tags :exclude_from_kubernetes
    NUMBER_OF_BATCHES = 50
    BATCH_SIZE = 200

--- a/app/workers/web_hooks/destroy_worker.rb
+++ b/app/workers/web_hooks/destroy_worker.rb
@@ -7,7 +7,6 @@ module WebHooks
    data_consistency :always
    sidekiq_options retry: 3
    feature_category :integrations
-    tags :exclude_from_kubernetes
    urgency :low
    idempotent!

--- a/app/workers/wikis/git_garbage_collect_worker.rb
+++ b/app/workers/wikis/git_garbage_collect_worker.rb
@@ -5,8 +5,6 @@ module Wikis
    extend ::Gitlab::Utils::Override
    include GitGarbageCollectMethods
-    tags :exclude_from_kubernetes
    private
    override :find_resource

--- a/config/feature_flags/development/ci_include_rules.yml
+++ b/config/feature_flags/development/ci_include_rules.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337507
 milestone: '14.2'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
--- a/doc/ci/yaml/index.md
+++ b/doc/ci/yaml/index.md
@@ -450,12 +450,12 @@ that proposes expanding this feature to support more variables.
 #### `rules` with `include`
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/276515) in GitLab 14.2.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/276515) in GitLab 14.2.
+> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/337507) in GitLab 14.3 and is ready for production use.
+> - [Enabled with `ci_include_rules` flag](https://gitlab.com/gitlab-org/gitlab/-/issues/337507) for self-managed GitLab in GitLab 14.3 and is ready for production use.
-NOTE:
+FLAG:
-On self-managed GitLab, by default this feature is not available. To make it available,
+On self-managed GitLab, by default this feature is available. To hide the feature per project or for your entire instance, ask an administrator to [disable the `ci_include_rules` flag](../../administration/feature_flags.md). On GitLab.com, this feature is available.
-ask an administrator to [enable the `ci_include_rules` flag](../../administration/feature_flags.md).
-On GitLab.com, this feature is not available. The feature is not ready for production use.
 You can use [`rules`](#rules) with `include` to conditionally include other configuration files.
 You can only use `rules:if` in `include` with [certain variables](#variables-with-include).
@@ -1627,7 +1627,7 @@ To disable directed acyclic graphs (DAG), set the limit to `0`.
 #### Artifact downloads with `needs`
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/14311) in GitLab v12.6.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/14311) in GitLab 12.6.
 When a job uses `needs`, it no longer downloads all artifacts from previous stages
 by default, because jobs with `needs` can start before earlier stages complete. With
@@ -1679,7 +1679,7 @@ with `needs`.
 #### Cross project artifact downloads with `needs` **(PREMIUM)**
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/14311) in GitLab v12.7.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/14311) in GitLab 12.7.
 Use `needs` to download artifacts from up to five jobs in pipelines:
@@ -1752,7 +1752,7 @@ pipelines running on the same ref could override the artifacts.
 #### Artifact downloads to child pipelines
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/255983) in GitLab v13.7.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/255983) in GitLab 13.7.
 A [child pipeline](../pipelines/parent_child_pipelines.md) can download artifacts from a job in
 its parent pipeline or another child pipeline in the same parent-child pipeline hierarchy.
@@ -2379,7 +2379,7 @@ cache-job:
 ##### `cache:key:files`
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/18986) in GitLab v12.5.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/18986) in GitLab 12.5.
 Use the `cache:key:files` keyword to generate a new key when one or two specific files
 change. `cache:key:files` lets you reuse some caches, and rebuild them less often,
@@ -2417,7 +2417,7 @@ fallback key is `default`.
 ##### `cache:key:prefix`
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/18986) in GitLab v12.5.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/18986) in GitLab 12.5.
 Use `cache:key:prefix` to combine a prefix with the SHA computed for [`cache:key:files`](#cachekeyfiles).

--- a/doc/development/cicd/templates.md
+++ b/doc/development/cicd/templates.md
@@ -289,9 +289,9 @@ If the `latest` template does not exist yet, you can copy [the stable template](
 ### How to include an older stable template
 Users may want to use an older [stable template](#stable-version) that is not bundled
-in the current GitLab package. For example, the stable templates in GitLab v13.0 and
+in the current GitLab package. For example, the stable templates in GitLab 13.0 and
-GitLab v14.0 could be so different that a user wants to continue using the v13.0 template even
+GitLab 14.0 could be so different that a user wants to continue using the GitLab 13.0
-after upgrading to GitLab 14.0.
+template even after upgrading to GitLab 14.0.
 You can add a note in the template or in documentation explaining how to use `include:remote`
 to include older template versions. If other templates are included with `include: template`,

--- a/doc/security/rack_attack.md
+++ b/doc/security/rack_attack.md
@@ -109,7 +109,7 @@ The following settings can be configured:
 - `enabled`: By default this is set to `false`. Set this to `true` to enable Rack Attack.
 - `ip_whitelist`: Whitelist any IPs from being blocked. They must be formatted as strings within a Ruby array.
-  CIDR notation is supported in GitLab v12.1 and up.
+  CIDR notation is supported in GitLab 12.1 and later.
  For example, `["127.0.0.1", "127.0.0.2", "127.0.0.3", "192.168.0.1/24"]`.
 - `maxretry`: The maximum amount of times a request can be made in the
  specified time.

--- a/doc/topics/autodevops/upgrading_auto_deploy_dependencies.md
+++ b/doc/topics/autodevops/upgrading_auto_deploy_dependencies.md
@@ -159,7 +159,7 @@ steps to upgrade to v2:
 To use a specific version of Auto Deploy dependencies, specify the previous Auto Deploy
 stable template that contains the [desired version of `auto-deploy-image` and `auto-deploy-app`](#verify-dependency-versions).
-For example, if the template is bundled in GitLab v13.3, change your `.gitlab-ci.yml` to:
+For example, if the template is bundled in GitLab 13.3, change your `.gitlab-ci.yml` to:
 ```yaml
 include:

--- a/ee/app/assets/javascripts/iterations/components/iteration_cadence_form.vue
+++ b/ee/app/assets/javascripts/iterations/components/iteration_cadence_form.vue
@@ -11,7 +11,7 @@ import {
  GlFormTextarea,
 } from '@gitlab/ui';
 import { TYPE_ITERATIONS_CADENCE } from '~/graphql_shared/constants';
-import { convertToGraphQLId } from '~/graphql_shared/utils';
+import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { s__, __ } from '~/locale';
 import createCadence from '../queries/cadence_create.mutation.graphql';
 import updateCadence from '../queries/cadence_update.mutation.graphql';
@@ -164,12 +164,15 @@ export default {
          id: this.cadenceId,
        };
      },
-      result({ data: { group, errors } }) {
+      result({ data: { group, errors }, error }) {
+        if (error) {
+          return;
+        }
        if (errors?.length) {
          [this.errorMessage] = errors;
          return;
        }
        const cadence = group?.iterationCadences?.nodes?.[0];
        if (!cadence) {
@@ -244,14 +247,17 @@ export default {
            return;
          }
-          const { errors } = data?.result || {};
+          const { iterationCadence, errors } = data?.result || {};
          if (errors?.length > 0) {
            [this.errorMessage] = errors;
            return;
          }
-          this.$router.push({ name: 'index' });
+          this.$router.push({
+            name: 'index',
+            query: { createdCadenceId: getIdFromGraphQLId(iterationCadence.id) },
+          });
        })
        .catch((e) => {
          this.errorMessage = __('Unable to save cadence. Please try again');

--- a/ee/app/assets/javascripts/iterations/components/iteration_cadence_list_item.vue
+++ b/ee/app/assets/javascripts/iterations/components/iteration_cadence_list_item.vue
@@ -15,11 +15,13 @@ import { __, s__ } from '~/locale';
 import { Namespace } from '../constants';
 import groupQuery from '../queries/group_iterations_in_cadence.query.graphql';
 import projectQuery from '../queries/project_iterations_in_cadence.query.graphql';
+import TimeboxStatusBadge from './timebox_status_badge.vue';
 const pageSize = 20;
 const i18n = Object.freeze({
  noResults: s__('Iterations|No iterations in cadence.'),
+  createFirstIteration: s__('Iterations|Create your first iteration'),
  error: __('Error loading iterations'),
  deleteCadence: s__('Iterations|Delete cadence'),
@@ -43,6 +45,7 @@ export default {
    GlInfiniteScroll,
    GlModal,
    GlSkeletonLoader,
+    TimeboxStatusBadge,
  },
  apollo: {
    workspace: {
@@ -84,6 +87,11 @@ export default {
      type: String,
      required: true,
    },
+    showStateBadge: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
  },
  data() {
    return {
@@ -150,6 +158,14 @@ export default {
      };
    },
  },
+  created() {
+    if (
+      `${this.$router.currentRoute?.query.createdCadenceId}` ===
+      `${getIdFromGraphQLId(this.cadenceId)}`
+    ) {
+      this.expanded = true;
+    }
+  },
  methods: {
    fetchMore() {
      if (this.iterations.length === 0 || !this.hasNextPage || this.loading) {
@@ -213,8 +229,7 @@ export default {
          name="chevron-right"
          class="gl-transition-medium"
          :class="{ 'gl-rotate-90': expanded }"
-        />
+        /><span class="gl-ml-2">{{ title }}</span>
-        {{ title }}
      </gl-button>
      <span v-if="durationInWeeks" class="gl-mr-5 gl-display-none gl-sm-display-inline-block">
@@ -279,6 +294,7 @@ export default {
              <router-link :to="path(iteration.id)">
                {{ iteration.title }}
              </router-link>
+              <timebox-status-badge v-if="showStateBadge" :state="iteration.state" />
            </li>
          </ol>
          <div v-if="loading" class="gl-p-5">
@@ -286,9 +302,19 @@ export default {
          </div>
        </template>
      </gl-infinite-scroll>
-      <p v-else-if="!loading" class="gl-px-5">
+      <template v-else-if="!loading">
-        {{ i18n.noResults }}
+        <p class="gl-px-7">{{ i18n.noResults }}</p>
-      </p>
+        <gl-button
+          v-if="!automatic"
+          variant="confirm"
+          category="secondary"
+          class="gl-mb-5 gl-ml-7"
+          data-qa-selector="create_cadence_cta"
+          :to="newIteration"
+        >
+          {{ i18n.createFirstIteration }}
+        </gl-button>
+      </template>
    </gl-collapse>
  </li>
 </template>
--- a/ee/app/assets/javascripts/iterations/components/iteration_cadences_list.vue
+++ b/ee/app/assets/javascripts/iterations/components/iteration_cadences_list.vue
@@ -97,6 +97,11 @@ export default {
      }
    },
  },
+  mounted() {
+    if (this.$router.currentRoute.query.createdCadenceId) {
+      this.$apollo.queries.workspace.refetch();
+    }
+  },
  methods: {
    nextPage() {
      this.pagination = {
@@ -172,6 +177,7 @@ export default {
            :automatic="cadence.automatic"
            :title="cadence.title"
            :iteration-state="state"
+            :show-state-badge="tabIndex === 2"
            @delete-cadence="deleteCadence"
          />
        </ul>

--- a/ee/app/assets/javascripts/iterations/components/iteration_report.vue
+++ b/ee/app/assets/javascripts/iterations/components/iteration_report.vue
@@ -2,7 +2,6 @@
 /* eslint-disable vue/no-v-html */
 import {
  GlAlert,
-  GlBadge,
  GlDropdown,
  GlDropdownItem,
  GlEmptyState,
@@ -13,29 +12,24 @@ import BurnCharts from 'ee/burndown_chart/components/burn_charts.vue';
 import { TYPE_ITERATION } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { formatDate } from '~/lib/utils/datetime_utility';
-import { __, s__ } from '~/locale';
+import { s__ } from '~/locale';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { Namespace } from '../constants';
 import query from '../queries/iteration.query.graphql';
 import IterationReportTabs from './iteration_report_tabs.vue';
+import TimeboxStatusBadge from './timebox_status_badge.vue';
-const iterationStates = {
-  closed: 'closed',
-  upcoming: 'upcoming',
-  expired: 'expired',
-};
 export default {
  components: {
    BurnCharts,
    GlAlert,
-    GlBadge,
    GlIcon,
    GlDropdown,
    GlDropdownItem,
    GlEmptyState,
    GlLoadingIcon,
    IterationReportTabs,
+    TimeboxStatusBadge,
  },
  apollo: {
    iteration: {
@@ -85,21 +79,6 @@ export default {
    showEmptyState() {
      return !this.loading && this.iteration && !this.iteration.title;
    },
-    status() {
-      switch (this.iteration.state) {
-        case iterationStates.closed:
-          return {
-            text: __('Closed'),
-            variant: 'danger',
-          };
-        case iterationStates.expired:
-          return { text: __('Past due'), variant: 'warning' };
-        case iterationStates.upcoming:
-          return { text: __('Upcoming'), variant: 'neutral' };
-        default:
-          return { text: __('Open'), variant: 'success' };
-      }
-    },
    editPage() {
      return {
        name: 'editIteration',
@@ -130,9 +109,7 @@ export default {
        ref="topbar"
        class="gl-display-flex gl-justify-items-center gl-align-items-center gl-py-3 gl-border-1 gl-border-b-solid gl-border-gray-100"
      >
-        <gl-badge :variant="status.variant">
+        <timebox-status-badge :state="iteration.state" />
-          {{ status.text }}
-        </gl-badge>
        <span class="gl-ml-4"
          >{{ formatDate(iteration.startDate) }} – {{ formatDate(iteration.dueDate) }}</span
        >

--- a/ee/app/assets/javascripts/iterations/components/timebox_status_badge.vue
+++ b/ee/app/assets/javascripts/iterations/components/timebox_status_badge.vue
+<script>
+import { GlBadge } from '@gitlab/ui';
+import { __ } from '~/locale';
+const iterationStates = {
+  closed: 'closed',
+  upcoming: 'upcoming',
+  expired: 'expired',
+};
+export default {
+  components: {
+    GlBadge,
+  },
+  props: {
+    state: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+  computed: {
+    status() {
+      switch (this.state) {
+        case iterationStates.closed:
+          return {
+            text: __('Closed'),
+            variant: 'danger',
+          };
+        case iterationStates.expired:
+          return { text: __('Past due'), variant: 'warning' };
+        case iterationStates.upcoming:
+          return { text: __('Upcoming'), variant: 'neutral' };
+        default:
+          return { text: __('Open'), variant: 'success' };
+      }
+    },
+  },
+};
+</script>
+<template>
+  <gl-badge :variant="status.variant">
+    {{ status.text }}
+  </gl-badge>
+</template>
--- a/ee/app/graphql/ee/types/group_type.rb
+++ b/ee/app/graphql/ee/types/group_type.rb
@@ -22,7 +22,6 @@ module EE
        field :epics, ::Types::EpicType.connection_type, null: true,
              description: 'Find epics.',
              extras: [:lookahead],
-              max_page_size: 2000,
              resolver: ::Resolvers::EpicsResolver
        field :epic_board,

--- a/ee/app/graphql/resolvers/concerns/sets_max_page_size.rb
+++ b/ee/app/graphql/resolvers/concerns/sets_max_page_size.rb
+# frozen_string_literal: true
+module SetsMaxPageSize
+  extend ActiveSupport::Concern
+  DEPRECATED_MAX_PAGE_SIZE = 1000
+  # We no longer need 1000 page size after epics roadmap pagination feature is released,
+  # after :performance_roadmap flag rollout we can safely use default max page size(100)
+  # for epics, child epics and child issues without breaking current roadmaps.
+  #
+  # When removing :performance_roadmap flag delete this file and remove its method call and
+  # the fields using the resolver will keep using default max page size.
+  # Flag rollout issue: https://gitlab.com/gitlab-org/gitlab/-/issues/337198
+  private
+  def set_temp_limit_for(actor)
+    max_page_size =
+      if Feature.enabled?(:performance_roadmap, actor, default_enabled: :yaml)
+        context.schema.default_max_page_size
+      else
+        DEPRECATED_MAX_PAGE_SIZE
+      end
+    field.max_page_size = max_page_size # rubocop: disable Graphql/Descriptions
+  end
+end
--- a/ee/app/graphql/resolvers/epic_issues_resolver.rb
+++ b/ee/app/graphql/resolvers/epic_issues_resolver.rb
--- a/ee/app/graphql/resolvers/epics_resolver.rb
+++ b/ee/app/graphql/resolvers/epics_resolver.rb
--- a/ee/app/graphql/types/epic_type.rb
+++ b/ee/app/graphql/types/epic_type.rb
--- a/ee/app/models/ee/project.rb
+++ b/ee/app/models/ee/project.rb
--- a/ee/app/models/license.rb
+++ b/ee/app/models/license.rb
--- a/ee/app/workers/active_user_count_threshold_worker.rb
+++ b/ee/app/workers/active_user_count_threshold_worker.rb
--- a/ee/app/workers/all_queues.yml
+++ b/ee/app/workers/all_queues.yml
--- a/ee/app/workers/analytics/devops_adoption/create_all_snapshots_worker.rb
+++ b/ee/app/workers/analytics/devops_adoption/create_all_snapshots_worker.rb
--- a/ee/app/workers/analytics/devops_adoption/create_snapshot_worker.rb
+++ b/ee/app/workers/analytics/devops_adoption/create_snapshot_worker.rb
--- a/ee/app/workers/approval_rules/external_approval_rule_payload_worker.rb
+++ b/ee/app/workers/approval_rules/external_approval_rule_payload_worker.rb
--- a/ee/app/workers/concerns/geo_queue.rb
+++ b/ee/app/workers/concerns/geo_queue.rb
--- a/ee/app/workers/dast_site_validation_worker.rb
+++ b/ee/app/workers/dast_site_validation_worker.rb
--- a/ee/app/workers/deployments/auto_rollback_worker.rb
+++ b/ee/app/workers/deployments/auto_rollback_worker.rb
--- a/ee/app/workers/dora/daily_metrics/refresh_worker.rb
+++ b/ee/app/workers/dora/daily_metrics/refresh_worker.rb
--- a/ee/app/workers/elastic_association_indexer_worker.rb
+++ b/ee/app/workers/elastic_association_indexer_worker.rb
--- a/ee/app/workers/elastic_remove_expired_namespace_subscriptions_from_index_cron_worker.rb
+++ b/ee/app/workers/elastic_remove_expired_namespace_subscriptions_from_index_cron_worker.rb
--- a/ee/app/workers/geo/container_repository_sync_dispatch_worker.rb
+++ b/ee/app/workers/geo/container_repository_sync_dispatch_worker.rb
--- a/ee/app/workers/geo/design_repository_shard_sync_worker.rb
+++ b/ee/app/workers/geo/design_repository_shard_sync_worker.rb
--- a/ee/app/workers/geo/destroy_worker.rb
+++ b/ee/app/workers/geo/destroy_worker.rb
--- a/ee/app/workers/geo/file_download_dispatch_worker.rb
+++ b/ee/app/workers/geo/file_download_dispatch_worker.rb
--- a/ee/app/workers/geo/metrics_update_worker.rb
+++ b/ee/app/workers/geo/metrics_update_worker.rb
--- a/ee/app/workers/geo/prune_event_log_worker.rb
+++ b/ee/app/workers/geo/prune_event_log_worker.rb
--- a/ee/app/workers/geo/repository_shard_sync_worker.rb
+++ b/ee/app/workers/geo/repository_shard_sync_worker.rb
--- a/ee/app/workers/geo/repository_sync_worker.rb
+++ b/ee/app/workers/geo/repository_sync_worker.rb
--- a/ee/app/workers/geo/repository_verification/primary/batch_worker.rb
+++ b/ee/app/workers/geo/repository_verification/primary/batch_worker.rb
--- a/ee/app/workers/geo/repository_verification/primary/shard_worker.rb
+++ b/ee/app/workers/geo/repository_verification/primary/shard_worker.rb
--- a/ee/app/workers/geo/repository_verification/primary/single_worker.rb
+++ b/ee/app/workers/geo/repository_verification/primary/single_worker.rb
--- a/ee/app/workers/geo/repository_verification/secondary/scheduler_worker.rb
+++ b/ee/app/workers/geo/repository_verification/secondary/scheduler_worker.rb
--- a/ee/app/workers/geo/repository_verification/secondary/shard_worker.rb
+++ b/ee/app/workers/geo/repository_verification/secondary/shard_worker.rb
--- a/ee/app/workers/geo/repository_verification/secondary/single_worker.rb
+++ b/ee/app/workers/geo/repository_verification/secondary/single_worker.rb
--- a/ee/app/workers/geo/reverification_batch_worker.rb
+++ b/ee/app/workers/geo/reverification_batch_worker.rb
--- a/ee/app/workers/geo/scheduler/per_shard_scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/per_shard_scheduler_worker.rb
--- a/ee/app/workers/geo/scheduler/primary/per_shard_scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/primary/per_shard_scheduler_worker.rb
--- a/ee/app/workers/geo/scheduler/primary/scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/primary/scheduler_worker.rb
--- a/ee/app/workers/geo/scheduler/secondary/per_shard_scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/secondary/per_shard_scheduler_worker.rb
--- a/ee/app/workers/geo/scheduler/secondary/scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/secondary/scheduler_worker.rb
--- a/ee/app/workers/geo/secondary/registry_consistency_worker.rb
+++ b/ee/app/workers/geo/secondary/registry_consistency_worker.rb
--- a/ee/app/workers/geo/secondary_usage_data_cron_worker.rb
+++ b/ee/app/workers/geo/secondary_usage_data_cron_worker.rb
--- a/ee/app/workers/geo/sync_timeout_cron_worker.rb
+++ b/ee/app/workers/geo/sync_timeout_cron_worker.rb
--- a/ee/app/workers/geo/verification_batch_worker.rb
+++ b/ee/app/workers/geo/verification_batch_worker.rb
--- a/ee/app/workers/geo/verification_cron_worker.rb
+++ b/ee/app/workers/geo/verification_cron_worker.rb
--- a/ee/app/workers/geo/verification_timeout_worker.rb
+++ b/ee/app/workers/geo/verification_timeout_worker.rb
--- a/ee/app/workers/geo/verification_worker.rb
+++ b/ee/app/workers/geo/verification_worker.rb
--- a/ee/app/workers/group_saml_group_sync_worker.rb
+++ b/ee/app/workers/group_saml_group_sync_worker.rb
--- a/ee/app/workers/group_wikis/git_garbage_collect_worker.rb
+++ b/ee/app/workers/group_wikis/git_garbage_collect_worker.rb
--- a/ee/app/workers/groups/update_statistics_worker.rb
+++ b/ee/app/workers/groups/update_statistics_worker.rb
--- a/ee/app/workers/incident_management/apply_incident_sla_exceeded_label_worker.rb
+++ b/ee/app/workers/incident_management/apply_incident_sla_exceeded_label_worker.rb
--- a/ee/app/workers/incident_management/incident_sla_exceeded_check_worker.rb
+++ b/ee/app/workers/incident_management/incident_sla_exceeded_check_worker.rb
--- a/ee/app/workers/incident_management/oncall_rotations/persist_all_rotations_shifts_job.rb
+++ b/ee/app/workers/incident_management/oncall_rotations/persist_all_rotations_shifts_job.rb
--- a/ee/app/workers/incident_management/oncall_rotations/persist_shifts_job.rb
+++ b/ee/app/workers/incident_management/oncall_rotations/persist_shifts_job.rb
--- a/ee/app/workers/ldap_group_sync_worker.rb
+++ b/ee/app/workers/ldap_group_sync_worker.rb
--- a/ee/app/workers/project_template_export_worker.rb
+++ b/ee/app/workers/project_template_export_worker.rb
--- a/ee/app/workers/requirements_management/import_requirements_csv_worker.rb
+++ b/ee/app/workers/requirements_management/import_requirements_csv_worker.rb
--- a/ee/app/workers/security/auto_fix_worker.rb
+++ b/ee/app/workers/security/auto_fix_worker.rb
--- a/ee/app/workers/security/store_scans_worker.rb
+++ b/ee/app/workers/security/store_scans_worker.rb
--- a/ee/app/workers/set_user_status_based_on_user_cap_setting_worker.rb
+++ b/ee/app/workers/set_user_status_based_on_user_cap_setting_worker.rb
--- a/ee/app/workers/todos_destroyer/confidential_epic_worker.rb
+++ b/ee/app/workers/todos_destroyer/confidential_epic_worker.rb
--- a/ee/app/workers/vulnerabilities/historical_statistics/deletion_worker.rb
+++ b/ee/app/workers/vulnerabilities/historical_statistics/deletion_worker.rb
--- a/ee/spec/frontend/iterations/components/iteration_cadence_form_spec.js
+++ b/ee/spec/frontend/iterations/components/iteration_cadence_form_spec.js
--- a/ee/spec/frontend/iterations/components/iteration_cadence_list_item_spec.js
+++ b/ee/spec/frontend/iterations/components/iteration_cadence_list_item_spec.js
--- a/ee/spec/frontend/iterations/components/iteration_report_spec.js
+++ b/ee/spec/frontend/iterations/components/iteration_report_spec.js
--- a/ee/spec/requests/api/graphql/epics/epic_issues_resolver_spec.rb
+++ b/ee/spec/requests/api/graphql/epics/epic_issues_resolver_spec.rb
--- a/ee/spec/requests/api/graphql/epics/epic_resolver_spec.rb
+++ b/ee/spec/requests/api/graphql/epics/epic_resolver_spec.rb
--- a/lib/gitlab/i18n.rb
+++ b/lib/gitlab/i18n.rb
--- a/lib/gitlab/integrations/sti_type.rb
+++ b/lib/gitlab/integrations/sti_type.rb
--- a/lib/gitlab/zentao/client.rb
+++ b/lib/gitlab/zentao/client.rb
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
--- a/spec/factories/integration_data.rb
+++ b/spec/factories/integration_data.rb
--- a/spec/factories/integrations.rb
+++ b/spec/factories/integrations.rb
--- a/spec/frontend/experimentation/utils_spec.js
+++ b/spec/frontend/experimentation/utils_spec.js
--- a/spec/frontend/tracking_spec.js
+++ b/spec/frontend/tracking_spec.js
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
--- a/spec/lib/gitlab/zentao/client_spec.rb
+++ b/spec/lib/gitlab/zentao/client_spec.rb
--- a/spec/migrations/add_triggers_to_integrations_type_new_spec.rb
+++ b/spec/migrations/add_triggers_to_integrations_type_new_spec.rb
--- a/spec/models/integrations/zentao_spec.rb
+++ b/spec/models/integrations/zentao_spec.rb
--- a/spec/models/integrations/zentao_tracker_data_spec.rb
+++ b/spec/models/integrations/zentao_tracker_data_spec.rb