From d7511e6d2f947dbae4b19947b746fdabb0897d92 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 20 Jun 2023 00:09:56 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../incidents/timeline_events_item.vue        |  42 +--
 app/models/integrations/webex_teams.rb        |  37 +--
 .../blueprints/organization/index.md          |  19 +-
 .../database/batched_background_migrations.md |   3 +
 doc/development/gems.md                       | 251 +++++++++---------
 doc/user/group/compliance_frameworks.md       |  18 +-
 .../project/merge_requests/approvals/index.md |   9 +-
 .../batched_background_migration_generator.rb |  46 +++-
 ..._batched_background_migration_job.template |  29 ++
 ..._batched_background_migration_job.template |  14 +
 .../migration/gitlab_migration_group_spec.rb  |   6 +-
 .../migration/gitlab_migration_issue_spec.rb  |  18 +-
 .../gitlab_migration_members_spec.rb          |  12 +-
 .../migration/gitlab_migration_mr_spec.rb     |   6 +-
 .../gitlab_migration_pipeline_spec.rb         |   6 +-
 .../gitlab_migration_project_spec.rb          |  18 +-
 .../gitlab_migration_release_spec.rb          |   6 +-
 .../incident_timeline_events_spec.rb          |   4 +-
 .../incidents/timeline_events_item_spec.js    |  10 +-
 ...hed_background_migration_generator_spec.rb |  80 +++---
 .../ee_my_batched_migration.txt               |  29 ++
 .../foss_my_batched_migration.txt             |  14 +
 spec/models/integrations/webex_teams_spec.rb  |   2 +-
 23 files changed, 440 insertions(+), 239 deletions(-)
 create mode 100644 lib/generators/batched_background_migration/templates/ee_batched_background_migration_job.template
 create mode 100644 lib/generators/batched_background_migration/templates/foss_batched_background_migration_job.template
 create mode 100644 spec/lib/generators/batched_background_migration/expected_files/ee_my_batched_migration.txt
 create mode 100644 spec/lib/generators/batched_background_migration/expected_files/foss_my_batched_migration.txt

diff --git a/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue b/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue
index d33f3146d64..b776822bd9a 100644
--- a/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue
+++ b/app/assets/javascripts/issues/show/components/incidents/timeline_events_item.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlDropdown, GlDropdownItem, GlIcon, GlSprintf, GlBadge } from '@gitlab/ui';
+import { GlDisclosureDropdown, GlIcon, GlSprintf, GlBadge } from '@gitlab/ui';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { formatDate } from '~/lib/utils/datetime_utility';
 import { timelineItemI18n } from './constants';
@@ -9,8 +9,7 @@ export default {
   name: 'IncidentTimelineEventListItem',
   i18n: timelineItemI18n,
   components: {
-    GlDropdown,
-    GlDropdownItem,
+    GlDisclosureDropdown,
     GlIcon,
     GlSprintf,
     GlBadge,
@@ -45,6 +44,25 @@ export default {
     canEditEvent() {
       return this.action === 'comment';
     },
+    items() {
+      const items = [];
+
+      if (this.canEditEvent) {
+        items.push({
+          text: this.$options.i18n.edit,
+          action: () => {
+            this.$emit('edit');
+          },
+        });
+      }
+      items.push({
+        text: this.$options.i18n.delete,
+        action: () => {
+          this.$emit('delete');
+        },
+      });
+      return items;
+    },
   },
   methods: {
     getEventIcon,
@@ -76,22 +94,16 @@ export default {
       </div>
       <div v-safe-html="noteHtml" class="md"></div>
     </div>
-    <gl-dropdown
+    <gl-disclosure-dropdown
       v-if="canUpdateTimelineEvent"
-      right
-      class="event-note-actions gl-ml-auto gl-align-self-start"
+      placement="right"
+      class="event-note-actions gl-align-self-start"
       icon="ellipsis_v"
       text-sr-only
-      :text="$options.i18n.moreActions"
+      :toggle-text="$options.i18n.moreActions"
       category="tertiary"
       no-caret
-    >
-      <gl-dropdown-item v-if="canEditEvent" @click="$emit('edit')">
-        {{ $options.i18n.edit }}
-      </gl-dropdown-item>
-      <gl-dropdown-item @click="$emit('delete')">
-        {{ $options.i18n.delete }}
-      </gl-dropdown-item>
-    </gl-dropdown>
+      :items="items"
+    />
   </div>
 </template>
diff --git a/app/models/integrations/webex_teams.rb b/app/models/integrations/webex_teams.rb
index 8e6f5ca6d17..ef1bc81ea58 100644
--- a/app/models/integrations/webex_teams.rb
+++ b/app/models/integrations/webex_teams.rb
@@ -2,6 +2,23 @@
 
 module Integrations
   class WebexTeams < BaseChatNotification
+    undef :notify_only_broken_pipelines
+
+    field :webhook,
+      section: SECTION_TYPE_CONNECTION,
+      help: 'https://api.ciscospark.com/v1/webhooks/incoming/...',
+      required: true
+
+    field :notify_only_broken_pipelines,
+      type: 'checkbox',
+      section: SECTION_TYPE_CONFIGURATION
+
+    field :branches_to_be_notified,
+      type: 'select',
+      section: SECTION_TYPE_CONFIGURATION,
+      title: -> { s_('Integrations|Branches for which notifications are to be sent') },
+      choices: -> { branch_choices }
+
     def title
       s_("WebexTeamsService|Webex Teams")
     end
@@ -14,6 +31,10 @@ module Integrations
       'webex_teams'
     end
 
+    def fields
+      self.class.fields + build_event_channels
+    end
+
     def help
       docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/webex_teams'), target: '_blank', rel: 'noopener noreferrer'
       s_("WebexTeamsService|Send notifications about project events to a Webex Teams conversation. %{docs_link}") % { docs_link: docs_link.html_safe }
@@ -23,21 +44,7 @@ module Integrations
     end
 
     def self.supported_events
-      %w[push issue confidential_issue merge_request note confidential_note tag_push
-         pipeline wiki_page]
-    end
-
-    def default_fields
-      [
-        { type: 'text', name: 'webhook', help: 'https://api.ciscospark.com/v1/webhooks/incoming/...', required: true },
-        { type: 'checkbox', name: 'notify_only_broken_pipelines' },
-        {
-          type: 'select',
-          name: 'branches_to_be_notified',
-          title: s_('Integrations|Branches for which notifications are to be sent'),
-          choices: self.class.branch_choices
-        }
-      ]
+      %w[push issue confidential_issue merge_request note confidential_note tag_push pipeline wiki_page]
     end
 
     private
diff --git a/doc/architecture/blueprints/organization/index.md b/doc/architecture/blueprints/organization/index.md
index be99211754d..c37a8260720 100644
--- a/doc/architecture/blueprints/organization/index.md
+++ b/doc/architecture/blueprints/organization/index.md
@@ -55,7 +55,7 @@ Due to urgency of delivering Organizations as a prerequisite for Cells, it is cu
 
 ## Proposal
 
-We create Organizations as a new lightweight entity, with just the features and workflows which it requires. We already have much of the functionality present in groups and projects, and groups themselves are essentially already the top-level entity. It is unlikely that we need to add significant features to Organizations outside of some key settings, as top-level groups can continue to serve this purpose at least on SaaS.
+We create Organizations as a new lightweight entity, with just the features and workflows which it requires. We already have much of the functionality present in groups and projects, and groups themselves are essentially already the top-level entity. It is unlikely that we need to add significant features to Organizations outside of some key settings, as top-level groups can continue to serve this purpose at least on SaaS. From an infrastructure perspective, cluster-wide shared data must be both minimal (small in volume) and infrequently written.
 
 ```mermaid
 graph TD
@@ -91,7 +91,7 @@ The Organization MVC will contain the following functionality:
 - Every instance will have a default organization. Initially, all users will be managed by this default Organization.
 - Organization Owner. The creation of an Organization appoints that user as the Organization Owner. Once established, the Organization Owner can appoint other Organization Owners.
 - Organization users. A user is managed by one Organization, but can be part of multiple Organizations. Users are able to navigate between the different Organizations they are part of.
-- Setup settings. Containing the Organization name, ID, description, README, and avatar. Settings are editable by the Organization Owner.
+- Setup settings. Containing the Organization name, ID, description, and avatar. Settings are editable by the Organization Owner.
 - Setup flow. Users are able to build an Organization on top of an existing top-level group. New users are able to create an Organization from scratch and to start building top-level groups from there.
 - Visibility. Options will be `public` and `private`. A nonuser of a specific Organization will not see private Organizations in the explore section. Visibility is editable by the Organization Owner.
 - Organization settings page with the added ability to remove an Organization. Deletion of the default Organization is prevented.
@@ -123,6 +123,10 @@ Non-users are external to the Organization and can only access the public resour
 
 Today only users, projects, namespaces and container images are considered routable entities which require global uniqueness on `https://gitlab.com/<path>/-/`. Initially, Organization routes will be [unscoped](../../../development/routing.md). Organizations will follow the path `https://gitlab.com/-/organizations/org-name/` as one of the design goals is that the addition of Organizations should not change existing group and project paths.
 
+### Impact of the Organization on Other Features
+
+We want a minimal amount of infrequently written tables in the shared database. If we have high write volume or large amounts of data in the shared database then this can become a single bottleneck for scaling and we lose the horizontal scalability objective of Cells.
+
 ## Iteration Plan
 
 The following iteration plan outlines how we intend to arrive at the Organization MVC. We are following the guidelines for [Experiment, Beta, and Generally Available features](../../../policy/experiment-beta-support.md).
@@ -142,7 +146,9 @@ In iteration 1, we introduce the concept of an Organization as a way to group to
 
 In iteration 2, an Organization MVC Experiment will be released. We will test the functionality with a select set of customers and improve the MVC based on these learnings. Users will be able to build an Organization on top of their existing top-level group.
 
-- The Organization has a description and a README.
+- The Organization has a description.
+- Organizations can be deleted.
+- Users can navigate between the different Organizations they are part of.
 
 ### Iteration 3: Organization MVC Beta (FY24Q4)
 
@@ -150,19 +156,24 @@ In iteration 3, the Organization MVC Beta will be released.
 
 - Multiple Organization Owners can be assigned.
 - Enterprise users can be added to an Organization.
+- Organization Owners can change the visibility of an organization between `public` and `private`. A nonuser of a specific Organization will not see private Organizations in the explore section.
 
 ### Iteration 4: Organization MVC GA (FY25Q1)
 
+In iteration 4, the Organization MVC will be rolled out.
+
 ### Post-MVC Iterations
 
 After the initial rollout of Organizations, the following functionality will be added to address customer needs relating to their implementation of GitLab:
 
 1. Internal visibility will be made available on Organizations that are part of GitLab.com.
+1. Projects can be created from the Organization-level Projects overview.
+1. Groups can be created from the Organization-level Groups overview.
 1. Move billing from top-level group to Organization.
 1. Audit events at the Organization level.
 1. Set merge request approval rules at the Organization level and cascade to all groups and projects.
 1. Security policies at the Organization level.
-1. Vulnerability reports at the Organization level.
+1. Vulnerability Report and Dependency List at the Organization level.
 1. Cascading Organization setting to enforce security scans.
 1. Scan result policies at the Organization level.
 1. Compliance frameworks.
diff --git a/doc/development/database/batched_background_migrations.md b/doc/development/database/batched_background_migrations.md
index 3e54a78757a..5aca74acc56 100644
--- a/doc/development/database/batched_background_migrations.md
+++ b/doc/development/database/batched_background_migrations.md
@@ -260,6 +260,9 @@ Background migration classes for EE-only features that use job arguments should
 in the GitLab FOSS class. This is required to prevent job arguments validation from failing when
 migration is scheduled in GitLab FOSS context.
 
+You can use the [generator](#generator) to generate an EE-only migration scaffold by passing
+`--ee-only` flag when generating a new batched background migration.
+
 ## Queueing
 
 Queueing a batched background migration should be done in a post-deployment
diff --git a/doc/development/gems.md b/doc/development/gems.md
index 4a332a28f62..d709e4ab223 100644
--- a/doc/development/gems.md
+++ b/doc/development/gems.md
@@ -9,38 +9,25 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 GitLab uses Gems as a tool to improve code reusability and modularity
 in a monolithic codebase.
 
-Sometimes we create libraries within our codebase that we want to
-extract, either because their functionality is highly isolated,
-we want to use them in other applications
-ourselves, or we think it would benefit the wider community.
+Sometimes we extract libraries from our codebase because their functionality
+is highly isolated and we want to use them in other applications
+ourselves or we think it would benefit the wider community.
 Extracting code to a gem also means that we can be sure that the gem
 does not contain any hidden dependencies on our application code.
 
-## When to use Gems
-
 Gems should be used always when implementing functions that can be considered isolated,
-that are decoupled from the business logic of GitLab and can be developed separately. Consider the
-following examples where Gem logic could be placed:
+that are decoupled from the business logic of GitLab and can be developed separately.
 
-The best example where we can look for opportunities to introduce new gems
+The best place in Rails where we can look for opportunities to extract new gems
 is the [lib/](https://gitlab.com/gitlab-org/gitlab/-/tree/master/lib/) folder.
 
 The **lib/** folder is a mix of code that is generic/universal, GitLab-specific, and tightly integrated with the rest of the codebase.
 
-If you cannot find a good place for your code in **lib/** you should strongly
-consider creating the new Gem [In the same repo](#in-the-same-repo).
+Ask yourself the question: **can this code also be used in a Ruby project other than the current project?**.
+If the answer is **Yes** you should strongly consider starting with creating a new Gem [in the same repo](#in-the-same-repo)
+and eventually evaluate whether to extract it as a separate repository.
 
-## In the same repo
-
-**Our GitLab Gems should be always put in `gems/` of GitLab monorepo.**
-
-That gives us the advantages of gems (modular code, quicker to run tests in development).
-and prevents complexity (coordinating changes across repos, new permissions, multiple projects, etc.).
-
-Gems stored in the same repo should be referenced in `Gemfile` with the `path:` syntax.
-They should not be published to RubyGems.
-
-### Advantages
+## Advantages of using Gems
 
 Using Gems can provide several benefits for code maintenance:
 
@@ -58,11 +45,116 @@ Using Gems can provide several benefits for code maintenance:
   Since the gem is packaged, not changed too often, it also allows us to run those tests less frequently improving
   CI testing time.
 
-### To Do
+## In the same repo
 
-#### Desired use cases
+**Our GitLab Gems should be always put in `gems/` of GitLab monorepo.**
 
-The `gitlab-utils` is a Gem containing as of set of class that implement common intrisic functions
+That gives us the advantages of gems (modular code, quicker to run tests in development).
+and prevents complexity (coordinating changes across repos, new permissions, multiple projects, etc.).
+
+Gems stored in the same repo should be referenced in `Gemfile` with the `path:` syntax.
+They should not be published to RubyGems.
+
+### Create and use a new Gem
+
+You can see example adding new Gem: [!121676](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121676).
+
+1. Create a new Ruby Gem in `gems/gitlab-<name-of-gem>` with `bundle gem gems/gitlab-<name-of-gem> --no-exe --no-coc --no-ext --no-mit`.
+1. Edit `gitlab-<name-of-gem>/README.md` to provide a simple description of the Gem.
+1. Edit `gitlab-<name-of-gem>/gitlab-<name-of-gem>.gemspec` and fill the details about the Gem as in the following example:
+
+   ```ruby
+   Gem::Specification.new do |spec|
+     spec.name = "gitlab-<name-of-gem>"
+     spec.version = Gitlab::NameOfGem::VERSION
+     spec.authors = ["group::tenant-scale"]
+     spec.email = ["engineering@gitlab.com"]
+
+     spec.summary = "GitLab's RSpec extensions"
+     spec.description = "A set of useful helpers to configure RSpec with various stubs and CI configs."
+     spec.homepage = "https://gitlab.com/gitlab-org/gitlab/-/tree/master/gems/gitlab-<name-of-gem>"
+     spec.required_ruby_version = ">= 2.6.0"
+   end
+   ```
+
+1. Update `gems/gitlab-<name-of-gem>/.rubocop` with:
+
+   ```yaml
+   inherit_from:
+     - ../../.rubocop.yml
+
+   CodeReuse/ActiveRecord:
+     Enabled: false
+
+   AllCops:
+     TargetRubyVersion: 3.0
+
+   Naming/FileName:
+     Exclude:
+       - spec/**/*.rb
+   ```
+
+1. Configure CI for a newly added Gem:
+
+   - Add `gems/gitlab-<name-of-gem>/.gitlab-ci.yml`:
+
+     ```yaml
+     workflow:
+       rules:
+         - if: $CI_MERGE_REQUEST_ID
+
+     rspec:
+       image: "ruby:${RUBY_VERSION}"
+       cache:
+         key: gitlab-<name-of-gem>
+         paths:
+           - gitlab-<name-of-gem>/vendor/ruby
+       before_script:
+         - cd gems/gitlab-<name-of-gem>
+         - ruby -v                                   # Print out ruby version for debugging
+         - gem install bundler --no-document         # Bundler is not installed with the image
+         - bundle config set --local path 'vendor'   # Install dependencies into ./vendor/ruby
+         - bundle config set with 'development'
+         - bundle config set --local frozen 'true'   # Disallow Gemfile.lock changes on CI
+         - bundle config                             # Show bundler configuration
+         - bundle install -j $(nproc)
+       script:
+         - bundle exec rspec
+       parallel:
+         matrix:
+           - RUBY_VERSION: ["2.7", "3.0", "3.1", "3.2"]
+     ```
+
+   - To `.gitlab/ci/rules.gitlab-ci.yml` add:
+
+     ```yaml
+     .gems:rules:gitlab-<name-of-gem>:
+       rules:
+         - <<: *if-merge-request
+           changes: ["gems/gitlab-<name-of-gem>/**/*"]
+     ```
+
+   - To `.gitlab/ci/gitlab-gems.gitlab-ci.yml` add:
+
+     ```yaml
+     gems gitlab-<name-of-gem>:
+       extends:
+         - .gems:rules:gitlab-<name-of-gem>
+       needs: []
+       trigger:
+         include: gems/gitlab-<name-of-gem>/.gitlab-ci.yml
+         strategy: depend
+     ```
+
+1. Reference Gem in `Gemfile` with:
+
+   ```ruby
+   gem 'gitlab-<name-of-gem>', path: 'gems/gitlab-<name-of-gem>'
+   ```
+
+### Examples of Gem extractions
+
+The `gitlab-utils` is a Gem containing as of set of class that implement common intrinsic functions
 used by GitLab developers, like `strong_memoize` or `Gitlab::Utils.to_boolean`.
 
 The `gitlab-database-schema-migrations` is a potential Gem containing our extensions to Rails
@@ -72,7 +164,7 @@ or potentially be upstreamed.
 
 The `gitlab-database-load-balancing` similar to previous is a potential Gem to implement GitLab specific
 load balancing to Rails database handling. Since this is rather complex and highly specific code
-maintaing it's complexity in a isolated and well tested Gem would help with removing this complexity
+maintaining its complexity in a isolated and well tested Gem would help with removing this complexity
 from a big monolithic codebase.
 
 The `gitlab-flipper` is another potential Gem implementing all our custom extensions to support feature
@@ -81,18 +173,10 @@ usage, adding consistency checks and various helpers to track owners of feature
 not really part of GitLab business logic and could be used to better track our implementation
 of Flipper and possibly much easier change it to dogfood [GitLab Feature Flags](../operations/feature_flags.md).
 
-The `gitlab-ci-reports-parsers` is a potential Gem that could implement all various parsers for various formats.
-The parsed output would be transformed into objects that could then be used by GitLab the application
-to store it in the database. This functionality could be an additional Gem since it is isolated,
-rarely changed, and GitLab Rails only consumes the data.
-
-The same pattern could be applied to all other type of parsers, like security vulnerabilities, or any
-other complex structures that need to be transformed into a form that is consumed by GitLab Rails.
-
 The `gitlab-active_record` is a gem adding GitLab specific Active Record patches.
 It is very well desired for such to be managed separately to isolate complexity.
 
-#### Other potential use cases
+### Other potential use cases
 
 The `gitlab-ci-config` is a potential Gem containing all our CI code used to parse `.gitlab-ci.yml`.
 This code is today lightly interlocked with GitLab the application due to lack of proper abstractions.
@@ -101,103 +185,6 @@ with GitLab the application. The interface would for example define an adapter t
 Once we would have a `gitlab-ci-config` Gem it could be used within GitLab and outside of GitLab Rails
 and [GitLab CLI](https://gitlab.com/gitlab-org/cli).
 
-### Create and use a new Gem
-
-You can see example adding new Gem: [!121676](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121676).
-
-1. Create a new Ruby Gem in `gems/gitlab-<name-of-gem>` with `bundle gem gems/gitlab-<name-of-gem> --no-exe --no-coc --no-ext --no-mit`.
-1. Edit or remove `gitlab-<name-of-gem>/README.md` to provide a simple one paragraph description of the Gem.
-1. Edit `gitlab-<name-of-gem>/gitlab-<name-of-gem>.gemspec` and fill the details about the Gem as in the following example:
-
-    ```ruby
-    Gem::Specification.new do |spec|
-      spec.name = "gitlab-<name-of-gem>"
-      spec.version = Gitlab::NameOfGem::VERSION
-      spec.authors = ["group::tenant-scale"]
-      spec.email = ["engineering@gitlab.com"]
-
-      spec.summary = "GitLab's RSpec extensions"
-      spec.description = "A set of useful helpers to configure RSpec with various stubs and CI configs."
-      spec.homepage = "https://gitlab.com/gitlab-org/gitlab/-/tree/master/gems/gitlab-<name-of-gem>"
-      spec.required_ruby_version = ">= 2.6.0"
-    end
-    ```
-
-1. Update `gems/gitlab-<name-of-gem>/.rubocop` with:
-
-    ```yaml
-    inherit_from:
-      - ../../.rubocop.yml
-
-    CodeReuse/ActiveRecord:
-      Enabled: false
-
-    AllCops:
-      TargetRubyVersion: 3.0
-
-    Naming/FileName:
-      Exclude:
-        - spec/**/*.rb
-    ```
-
-1. Configure CI for a newly added Gem:
-
-- Add `gems/gitlab-<name-of-gem>/.gitlab-ci.yml`:
-
-    ```yaml
-    workflow:
-      rules:
-        - if: $CI_MERGE_REQUEST_ID
-
-    rspec:
-      image: "ruby:${RUBY_VERSION}"
-      cache:
-        key: gitlab-<name-of-gem>
-        paths:
-          - gitlab-<name-of-gem>/vendor/ruby
-      before_script:
-        - cd gems/gitlab-<name-of-gem>
-        - ruby -v                                   # Print out ruby version for debugging
-        - gem install bundler --no-document         # Bundler is not installed with the image
-        - bundle config set --local path 'vendor'   # Install dependencies into ./vendor/ruby
-        - bundle config set with 'development'
-        - bundle config set --local frozen 'true'   # Disallow Gemfile.lock changes on CI
-        - bundle config                             # Show bundler configuration
-        - bundle install -j $(nproc)
-      script:
-        - bundle exec rspec
-      parallel:
-        matrix:
-          - RUBY_VERSION: ["2.7", "3.0", "3.1", "3.2"]
-    ```
-
-- To `.gitlab/ci/rules.gitlab-ci.yml` add:
-
-    ```yaml
-    .gems:rules:gitlab-<name-of-gem>:
-      rules:
-        - <<: *if-merge-request
-          changes: ["gems/gitlab-<name-of-gem>/**/*"]
-    ```
-
-- To `.gitlab/ci/gitlab-gems.gitlab-ci.yml` add:
-
-    ```yaml
-    gems gitlab-<name-of-gem>:
-      extends:
-        - .gems:rules:gitlab-<name-of-gem>
-      needs: []
-      trigger:
-        include: gems/gitlab-<name-of-gem>/.gitlab-ci.yml
-        strategy: depend
-    ```
-
-1. Reference Gem in `Gemfile` with:
-
-    ```ruby
-    gem 'gitlab-<name-of-gem>', path: 'gems/gitlab-<name-of-gem>'
-    ```
-
 ## In the external repo
 
 In general, we want to think carefully before doing this as there are
diff --git a/doc/user/group/compliance_frameworks.md b/doc/user/group/compliance_frameworks.md
index 47764b0c915..0ba329a8963 100644
--- a/doc/user/group/compliance_frameworks.md
+++ b/doc/user/group/compliance_frameworks.md
@@ -104,6 +104,10 @@ However, the compliance pipeline configuration can reference the `.gitlab-ci.yml
 - Jobs and variables defined in the compliance pipeline can't be changed by variables in the labeled project's
   `.gitlab-ci.yml` file.
 
+NOTE:
+Because of a [known issue](https://gitlab.com/gitlab-org/gitlab/-/issues/414004), project pipelines must be included first at the top of compliance pipeline configuration
+to prevent projects overriding settings downstream.
+
 For more information, see:
 
 - [Example configuration](#example-configuration) for help configuring a compliance pipeline that runs jobs from
@@ -151,6 +155,13 @@ The following example `.compliance-gitlab-ci.yml` includes the `include` keyword
 configuration is also executed.
 
 ```yaml
+include:  # Execute individual project's configuration (if project contains .gitlab-ci.yml)
+  - project: '$CI_PROJECT_PATH'
+    file: '$CI_CONFIG_PATH'
+    ref: '$CI_COMMIT_SHA' # Must be defined or MR pipelines always use the use default branch
+    rules:
+      - if: $CI_PROJECT_PATH != "my-group/project-1" # Must be the hardcoded path to the project that hosts this configuration.
+
 # Allows compliance team to control the ordering and interweaving of stages/jobs.
 # Stages without jobs defined will remain hidden.
 stages:
@@ -210,13 +221,6 @@ audit trail:
     - echo "running $FOO"
   after_script:
     - "# No after scripts."
-
-include:  # Execute individual project's configuration (if project contains .gitlab-ci.yml)
-  - project: '$CI_PROJECT_PATH'
-    file: '$CI_CONFIG_PATH'
-    ref: '$CI_COMMIT_SHA' # Must be defined or MR pipelines always use the use default branch
-    rules:
-      - if: $CI_PROJECT_PATH != "my-group/project-1" # Must be the hardcoded path to the project that hosts this configuration.
 ```
 
 The `rules` configuration in the `include` definition avoids circular inclusion in case the compliance pipeline must be able to run in the host project itself.
diff --git a/doc/user/project/merge_requests/approvals/index.md b/doc/user/project/merge_requests/approvals/index.md
index 68d5665139a..2a574764954 100644
--- a/doc/user/project/merge_requests/approvals/index.md
+++ b/doc/user/project/merge_requests/approvals/index.md
@@ -121,11 +121,10 @@ Whenever an approval rule cannot be satisfied, the rule is displayed as **(!) Au
 - No eligible approvers (either groups or users) have been assigned to the approval rule.
 - The number of required approvals is more than the number of eligible approvers.
 
-These rules are automatically approved to unblock their respective merge requests,
-unless they were created through a security policy.
-
-Invalid approval rules created through a security policy are presented with **(!) Action Required**
-and are not automatically approved, blocking their respective merge requests.
+These rules are automatically approved to unblock their respective merge requests, unless they were
+created through a [scan result policy](../../../application_security/policies/scan-result-policies.md).
+Invalid approval rules created through a scan result policy are presented with
+**(!) Action Required** and are not automatically approved, blocking their respective merge requests.
 
 ## Related topics
 
diff --git a/lib/generators/batched_background_migration/batched_background_migration_generator.rb b/lib/generators/batched_background_migration/batched_background_migration_generator.rb
index c68ed52c1a0..44aff6fe17a 100644
--- a/lib/generators/batched_background_migration/batched_background_migration_generator.rb
+++ b/lib/generators/batched_background_migration/batched_background_migration_generator.rb
@@ -6,9 +6,12 @@ module BatchedBackgroundMigration
   class BatchedBackgroundMigrationGenerator < ActiveRecord::Generators::Base
     source_root File.expand_path('templates', __dir__)
 
-    class_option :table_name
-    class_option :column_name
-    class_option :feature_category
+    class_option :table_name, type: :string, required: true, desc: "Table from which records we will be batching"
+    class_option :column_name, type: :string, required: true, desc: "Column to use for batching", default: :id
+    class_option :feature_category, type: :string, required: true,
+      desc: "Feature category to which this batched background migration belongs to"
+    class_option :ee_only, type: :boolean, desc: "Generate files for EE-only batched background migration",
+      default: false
 
     def validate!
       raise ArgumentError, "table_name is required" unless table_name.present?
@@ -29,15 +32,32 @@ module BatchedBackgroundMigration
     end
 
     def create_batched_background_migration_class_and_specs
-      template(
-        "batched_background_migration_job.template",
-        File.join("lib/gitlab/background_migration/#{file_name}.rb")
-      )
+      if ee_only?
+        template(
+          "ee_batched_background_migration_job.template",
+          File.join("ee/lib/ee/gitlab/background_migration/#{file_name}.rb")
+        )
 
-      template(
-        "batched_background_migration_job_spec.template",
-        File.join("spec/lib/gitlab/background_migration/#{file_name}_spec.rb")
-      )
+        template(
+          "foss_batched_background_migration_job.template",
+          File.join("lib/gitlab/background_migration/#{file_name}.rb")
+        )
+
+        template(
+          "batched_background_migration_job_spec.template",
+          File.join("ee/spec/lib/ee/gitlab/background_migration/#{file_name}_spec.rb")
+        )
+      else
+        template(
+          "batched_background_migration_job.template",
+          File.join("lib/gitlab/background_migration/#{file_name}.rb")
+        )
+
+        template(
+          "batched_background_migration_job_spec.template",
+          File.join("spec/lib/gitlab/background_migration/#{file_name}_spec.rb")
+        )
+      end
     end
 
     def create_dictionary_file
@@ -65,6 +85,10 @@ module BatchedBackgroundMigration
       options[:feature_category]
     end
 
+    def ee_only?
+      options[:ee_only]
+    end
+
     def current_milestone
       version = Gem::Version.new(File.read('VERSION'))
       version.release.segments.first(2).join('.')
diff --git a/lib/generators/batched_background_migration/templates/ee_batched_background_migration_job.template b/lib/generators/batched_background_migration/templates/ee_batched_background_migration_job.template
new file mode 100644
index 00000000000..b36fc216acd
--- /dev/null
+++ b/lib/generators/batched_background_migration/templates/ee_batched_background_migration_job.template
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# See https://docs.gitlab.com/ee/development/database/batched_background_migrations.html
+# for more information on how to use batched background migrations
+
+# Update below commented lines with appropriate values.
+
+module EE
+  module Gitlab
+    module BackgroundMigration
+      module <%= class_name %>
+        extend ActiveSupport::Concern
+        extend ::Gitlab::Utils::Override
+
+        prepended do
+          # operation_name :my_operation
+          # scope_to ->(relation) { relation.where(column: "value") }
+        end
+
+        override :perform
+        def perform
+          each_sub_batch do |sub_batch|
+            # Your action on each sub_batch
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/generators/batched_background_migration/templates/foss_batched_background_migration_job.template b/lib/generators/batched_background_migration/templates/foss_batched_background_migration_job.template
new file mode 100644
index 00000000000..6a39c32955d
--- /dev/null
+++ b/lib/generators/batched_background_migration/templates/foss_batched_background_migration_job.template
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # TODO Add a top-level documentation comment for the class
+    class <%= class_name %> < BatchedMigrationJob
+      feature_category :<%= feature_category %>
+
+      def perform; end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::<%= class_name %>.prepend_mod
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_group_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_group_spec.rb
index ac85795b2bb..60b17f3aeb5 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_group_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_group_spec.rb
@@ -76,7 +76,11 @@ module QA
 
         it(
           'successfully imports group milestones and badges',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347628'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347628',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415270"
+          }
         ) do
           expect_group_import_finished_successfully
 
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_issue_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_issue_spec.rb
index bff1837f51b..477f7b42dad 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_issue_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_issue_spec.rb
@@ -43,7 +43,11 @@ module QA
 
         it(
           'successfully imports issue',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347608'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347608',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415247"
+          }
         ) do
           expect_project_import_finished_successfully
           expect(imported_issues.count).to eq(1)
@@ -67,7 +71,11 @@ module QA
 
         it(
           'preserves related merge request',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/386305'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/386305',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415247"
+          }
         ) do
           expect_project_import_finished_successfully
           expect(imported_related_mrs).to eq([source_mr.iid])
@@ -91,7 +99,11 @@ module QA
 
         it(
           'successfully imports design',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/366449'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/366449',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415247"
+          }
         ) do
           expect_project_import_finished_successfully
           expect(imported_issues.count).to eq(1)
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_members_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_members_spec.rb
index ed79281b328..bd03f35953a 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_members_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_members_spec.rb
@@ -33,7 +33,11 @@ module QA
 
         it(
           'member retains indirect membership in imported project',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/354416'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/354416',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415271"
+          }
         ) do
           expect_project_import_finished_successfully
 
@@ -51,7 +55,11 @@ module QA
 
         it(
           'member retains direct membership in imported project',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/354417'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/354417',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415271"
+          }
         ) do
           expect_project_import_finished_successfully
 
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_mr_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_mr_spec.rb
index 7d785630a57..e4fd424b69f 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_mr_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_mr_spec.rb
@@ -70,7 +70,11 @@ module QA
       context 'with merge request' do
         it(
           'successfully imports merge request',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348478'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348478',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415245"
+          }
         ) do
           expect_project_import_finished_successfully
           expect(imported_mrs.count).to eq(1)
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_pipeline_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_pipeline_spec.rb
index 2f80f4c07ed..c031550c86a 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_pipeline_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_pipeline_spec.rb
@@ -45,7 +45,11 @@ module QA
 
         it(
           'successfully imports ci pipeline',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/354650'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/354650',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415272"
+          }
         ) do
           expect_project_import_finished_successfully
 
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb
index 0c94d6e64d5..9007e5723a9 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb
@@ -46,7 +46,11 @@ module QA
       context 'with uninitialized project' do
         it(
           'successfully imports project',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347610'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347610',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415246"
+          }
         ) do
           expect_project_import_finished_successfully
 
@@ -95,7 +99,11 @@ module QA
 
         it(
           'successfully imports repository',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347570'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347570',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415246"
+          }
         ) do
           expect_project_import_finished_successfully
 
@@ -114,7 +122,11 @@ module QA
 
         it(
           'successfully imports project wiki',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347567'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347567',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415246"
+          }
         ) do
           expect_project_import_finished_successfully
 
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_release_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_release_spec.rb
index 2443887c3d4..3237dfca107 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_release_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_release_spec.rb
@@ -58,7 +58,11 @@ module QA
 
         it(
           'successfully imports project release',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/360243'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/360243',
+          quarantine: {
+            type: :investigating,
+            issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415292"
+          }
         ) do
           expect_project_import_finished_successfully
 
diff --git a/spec/features/incidents/incident_timeline_events_spec.rb b/spec/features/incidents/incident_timeline_events_spec.rb
index 4d51ed652c9..8829f21cabe 100644
--- a/spec/features/incidents/incident_timeline_events_spec.rb
+++ b/spec/features/incidents/incident_timeline_events_spec.rb
@@ -86,8 +86,8 @@ RSpec.describe 'Incident timeline events', :js, feature_category: :incident_mana
     def trigger_dropdown_action(text)
       click_button _('More actions')
 
-      page.within '.gl-dropdown-contents' do
-        page.find('.gl-dropdown-item', text: text).click
+      page.within '[data-testid="disclosure-content"]' do
+        page.find('[data-testid="disclosure-dropdown-item"]', text: text).click
       end
     end
   end
diff --git a/spec/frontend/issues/show/components/incidents/timeline_events_item_spec.js b/spec/frontend/issues/show/components/incidents/timeline_events_item_spec.js
index 24653a23036..2500c808073 100644
--- a/spec/frontend/issues/show/components/incidents/timeline_events_item_spec.js
+++ b/spec/frontend/issues/show/components/incidents/timeline_events_item_spec.js
@@ -1,5 +1,5 @@
 import timezoneMock from 'timezone-mock';
-import { GlIcon, GlDropdown, GlBadge } from '@gitlab/ui';
+import { GlIcon, GlDisclosureDropdown, GlBadge } from '@gitlab/ui';
 import { nextTick } from 'vue';
 import { timelineItemI18n } from '~/issues/show/components/incidents/constants';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
@@ -28,7 +28,7 @@ describe('IncidentTimelineEventList', () => {
   const findCommentIcon = () => wrapper.findComponent(GlIcon);
   const findEventTime = () => wrapper.findByTestId('event-time');
   const findEventTags = () => wrapper.findAllComponents(GlBadge);
-  const findDropdown = () => wrapper.findComponent(GlDropdown);
+  const findGlDropdown = () => wrapper.findComponent(GlDisclosureDropdown);
   const findDeleteButton = () => wrapper.findByText(timelineItemI18n.delete);
   const findEditButton = () => wrapper.findByText(timelineItemI18n.edit);
 
@@ -85,7 +85,7 @@ describe('IncidentTimelineEventList', () => {
 
     describe('action dropdown', () => {
       it('does not show the action dropdown by default', () => {
-        expect(findDropdown().exists()).toBe(false);
+        expect(findGlDropdown().exists()).toBe(false);
         expect(findDeleteButton().exists()).toBe(false);
       });
 
@@ -100,14 +100,14 @@ describe('IncidentTimelineEventList', () => {
           mockEvent: systemGeneratedMockEvent,
         });
 
-        expect(findDropdown().exists()).toBe(true);
+        expect(findGlDropdown().exists()).toBe(true);
         expect(findEditButton().exists()).toBe(false);
       });
 
       it('shows dropdown and delete item when user has update permission', () => {
         mountComponent({ provide: { canUpdateTimelineEvent: true } });
 
-        expect(findDropdown().exists()).toBe(true);
+        expect(findGlDropdown().exists()).toBe(true);
         expect(findDeleteButton().exists()).toBe(true);
       });
 
diff --git a/spec/lib/generators/batched_background_migration/batched_background_migration_generator_spec.rb b/spec/lib/generators/batched_background_migration/batched_background_migration_generator_spec.rb
index d533bcf0039..d60d0c3c853 100644
--- a/spec/lib/generators/batched_background_migration/batched_background_migration_generator_spec.rb
+++ b/spec/lib/generators/batched_background_migration/batched_background_migration_generator_spec.rb
@@ -20,15 +20,17 @@ RSpec.describe BatchedBackgroundMigration::BatchedBackgroundMigrationGenerator,
     rm_rf(destination_root)
   end
 
-  context 'with valid arguments' do
-    let(:expected_migration_file) { load_expected_file('queue_my_batched_migration.txt') }
-    let(:expected_migration_spec_file) { load_expected_file('queue_my_batched_migration_spec.txt') }
-    let(:expected_migration_job_file) { load_expected_file('my_batched_migration.txt') }
-    let(:expected_migration_job_spec_file) { load_expected_file('my_batched_migration_spec_matcher.txt') }
-    let(:expected_migration_dictionary) { load_expected_file('my_batched_migration_dictionary_matcher.txt') }
+  shared_examples "generates files common to both types of migrations" do |migration_job_file, migration_file,
+    migration_spec_file, migration_dictionary_file|
+    let(:expected_migration_job_file) { load_expected_file(migration_job_file) }
+    let(:expected_migration_file) { load_expected_file(migration_file) }
+    let(:expected_migration_spec_file) { load_expected_file(migration_spec_file) }
+    let(:expected_migration_dictionary) { load_expected_file(migration_dictionary_file) }
 
-    it 'generates expected files' do
-      run_generator %w[my_batched_migration --table_name=projects --column_name=id --feature_category=database]
+    it 'generates expected common files' do
+      assert_file('lib/gitlab/background_migration/my_batched_migration.rb') do |migration_job_file|
+        expect(migration_job_file).to eq(expected_migration_job_file)
+      end
 
       assert_migration('db/post_migrate/queue_my_batched_migration.rb') do |migration_file|
         expect(migration_file).to eq(expected_migration_file)
@@ -38,15 +40,6 @@ RSpec.describe BatchedBackgroundMigration::BatchedBackgroundMigrationGenerator,
         expect(migration_spec_file).to eq(expected_migration_spec_file)
       end
 
-      assert_file('lib/gitlab/background_migration/my_batched_migration.rb') do |migration_job_file|
-        expect(migration_job_file).to eq(expected_migration_job_file)
-      end
-
-      assert_file('spec/lib/gitlab/background_migration/my_batched_migration_spec.rb') do |migration_job_spec_file|
-        # Regex is used to match the dynamic schema: <version> in the specs
-        expect(migration_job_spec_file).to match(/#{expected_migration_job_spec_file}/)
-      end
-
       assert_file('db/docs/batched_background_migrations/my_batched_migration.yml') do |migration_dictionary|
         # Regex is used to match the dynamically generated 'milestone' in the dictionary
         expect(migration_dictionary).to match(/#{expected_migration_dictionary}/)
@@ -54,23 +47,50 @@ RSpec.describe BatchedBackgroundMigration::BatchedBackgroundMigrationGenerator,
     end
   end
 
-  context 'without required arguments' do
-    it 'throws table_name is required error' do
-      expect do
-        run_generator %w[my_batched_migration]
-      end.to raise_error(ArgumentError, 'table_name is required')
+  context 'when generating EE-only batched background migration' do
+    before do
+      run_generator %w[my_batched_migration --table_name=projects --column_name=id --feature_category=database
+        --ee-only]
     end
 
-    it 'throws column_name is required error' do
-      expect do
-        run_generator %w[my_batched_migration --table_name=projects]
-      end.to raise_error(ArgumentError, 'column_name is required')
+    let(:expected_ee_migration_job_file) { load_expected_file('ee_my_batched_migration.txt') }
+    let(:expected_migration_job_spec_file) { load_expected_file('my_batched_migration_spec_matcher.txt') }
+
+    include_examples "generates files common to both types of migrations",
+      'foss_my_batched_migration.txt',
+      'queue_my_batched_migration.txt',
+      'queue_my_batched_migration_spec.txt',
+      'my_batched_migration_dictionary_matcher.txt'
+
+    it 'generates expected files' do
+      assert_file('ee/lib/ee/gitlab/background_migration/my_batched_migration.rb') do |migration_job_file|
+        expect(migration_job_file).to eq(expected_ee_migration_job_file)
+      end
+
+      assert_file('ee/spec/lib/ee/gitlab/background_migration/my_batched_migration_spec.rb') do |migration_job_spec_file| # rubocop:disable Layout/LineLength
+        expect(migration_job_spec_file).to match(/#{expected_migration_job_spec_file}/)
+      end
+    end
+  end
+
+  context 'when generating FOSS batched background migration' do
+    before do
+      run_generator %w[my_batched_migration --table_name=projects --column_name=id --feature_category=database]
     end
 
-    it 'throws feature_category is required error' do
-      expect do
-        run_generator %w[my_batched_migration --table_name=projects --column_name=id]
-      end.to raise_error(ArgumentError, 'feature_category is required')
+    let(:expected_migration_job_spec_file) { load_expected_file('my_batched_migration_spec_matcher.txt') }
+
+    include_examples "generates files common to both types of migrations",
+      'my_batched_migration.txt',
+      'queue_my_batched_migration.txt',
+      'queue_my_batched_migration_spec.txt',
+      'my_batched_migration_dictionary_matcher.txt'
+
+    it 'generates expected files' do
+      assert_file('spec/lib/gitlab/background_migration/my_batched_migration_spec.rb') do |migration_job_spec_file|
+        # Regex is used to match the dynamic schema: <version> in the specs
+        expect(migration_job_spec_file).to match(/#{expected_migration_job_spec_file}/)
+      end
     end
   end
 
diff --git a/spec/lib/generators/batched_background_migration/expected_files/ee_my_batched_migration.txt b/spec/lib/generators/batched_background_migration/expected_files/ee_my_batched_migration.txt
new file mode 100644
index 00000000000..004ae46ca5f
--- /dev/null
+++ b/spec/lib/generators/batched_background_migration/expected_files/ee_my_batched_migration.txt
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# See https://docs.gitlab.com/ee/development/database/batched_background_migrations.html
+# for more information on how to use batched background migrations
+
+# Update below commented lines with appropriate values.
+
+module EE
+  module Gitlab
+    module BackgroundMigration
+      module MyBatchedMigration
+        extend ActiveSupport::Concern
+        extend ::Gitlab::Utils::Override
+
+        prepended do
+          # operation_name :my_operation
+          # scope_to ->(relation) { relation.where(column: "value") }
+        end
+
+        override :perform
+        def perform
+          each_sub_batch do |sub_batch|
+            # Your action on each sub_batch
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/generators/batched_background_migration/expected_files/foss_my_batched_migration.txt b/spec/lib/generators/batched_background_migration/expected_files/foss_my_batched_migration.txt
new file mode 100644
index 00000000000..7c2e1f4fc04
--- /dev/null
+++ b/spec/lib/generators/batched_background_migration/expected_files/foss_my_batched_migration.txt
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # TODO Add a top-level documentation comment for the class
+    class MyBatchedMigration < BatchedMigrationJob
+      feature_category :database
+
+      def perform; end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::MyBatchedMigration.prepend_mod
diff --git a/spec/models/integrations/webex_teams_spec.rb b/spec/models/integrations/webex_teams_spec.rb
index b5cba6762aa..50a1383292b 100644
--- a/spec/models/integrations/webex_teams_spec.rb
+++ b/spec/models/integrations/webex_teams_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Integrations::WebexTeams do
+RSpec.describe Integrations::WebexTeams, feature_category: :integrations do
   it_behaves_like "chat integration", "Webex Teams" do
     let(:client_arguments) { webhook_url }
     let(:payload) do