From 16cfd85bcf0046ae97d7ea84dae7eea3eafafe99 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 9 Feb 2021 18:09:59 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../settings/group/bundle.js                  |   3 +
 .../group/components/group_settings_app.vue   |  19 ++-
 app/finders/container_repositories_finder.rb  |   9 +-
 .../container_repositories_resolver.rb        |   9 +-
 .../types/container_repository_sort_enum.rb   |  11 ++
 app/models/container_repository.rb            |   1 +
 app/models/note.rb                            |   2 +-
 app/models/pages/lookup_path.rb               |   3 +-
 app/models/pages_deployment.rb                |   7 ++
 .../issues/import_csv/_button.html.haml       |   2 +-
 .../shared/empty_states/_issues.html.haml     |   2 +-
 app/workers/new_note_worker.rb                |   2 +-
 .../290302-sort-container-repositories.yml    |   5 +
 .../gl-button-empty-issue-placeholder.yml     |   5 +
 .../track-5-mins-prod-app-usage.yml           |   5 +
 doc/administration/file_hooks.md              |   2 +-
 doc/administration/git_protocol.md            |   2 +-
 doc/administration/integration/plantuml.md    |   2 +-
 .../invalidate_markdown_cache.md              |   2 +-
 doc/api/branches.md                           |   2 +-
 doc/api/commits.md                            |   2 +-
 doc/api/discussions.md                        |   2 +-
 .../graphql/reference/gitlab_schema.graphql   |  65 ++++++++++
 doc/api/graphql/reference/gitlab_schema.json  |  91 ++++++++++++++
 doc/api/graphql/reference/index.md            |  17 +++
 doc/api/keys.md                               |   2 +-
 doc/api/markdown.md                           |   2 +-
 doc/api/merge_request_context_commits.md      |   2 +-
 doc/api/merge_requests.md                     |   2 +-
 doc/api/project_badges.md                     |   2 +-
 doc/api/project_import_export.md              |   2 +-
 doc/api/project_statistics.md                 |   2 +-
 doc/api/project_templates.md                  |   2 +-
 doc/api/protected_branches.md                 |   2 +-
 doc/api/protected_tags.md                     |   2 +-
 doc/api/remote_mirrors.md                     |   2 +-
 doc/api/repository_files.md                   |   2 +-
 doc/api/repository_submodules.md              |   2 +-
 doc/api/search.md                             |   2 +-
 doc/api/suggestions.md                        |   2 +-
 doc/api/tags.md                               |   2 +-
 doc/development/approval_rules.md             |   2 +-
 doc/development/code_intelligence/index.md    |   2 +-
 doc/development/documentation/index.md        |   2 +-
 doc/development/internal_api.md               |   2 +-
 doc/development/lfs.md                        |   2 +-
 .../new_fe_guide/modules/widget_extensions.md |   2 +-
 doc/gitlab-basics/README.md                   |   2 +-
 doc/gitlab-basics/add-file.md                 |   2 +-
 doc/gitlab-basics/command-line-commands.md    |   2 +-
 doc/gitlab-basics/create-branch.md            |   2 +-
 doc/gitlab-basics/feature_branch_workflow.md  |   2 +-
 doc/gitlab-basics/start-using-git.md          |   2 +-
 doc/integration/sourcegraph.md                |   2 +-
 doc/intro/README.md                           |   2 +-
 doc/topics/git/feature_branch_development.md  |   2 +-
 doc/topics/git/git_rebase.md                  |   2 +-
 doc/topics/git/how_to_install_git/index.md    |   2 +-
 doc/topics/git/index.md                       |   2 +-
 doc/topics/git/lfs/index.md                   |   2 +-
 .../lfs/migrate_from_git_annex_to_git_lfs.md  |   2 +-
 .../index.md                                  |   2 +-
 doc/topics/git/partial_clone.md               |   2 +-
 doc/topics/git/troubleshooting_git.md         |   2 +-
 doc/topics/git/useful_git_commands.md         |   2 +-
 doc/topics/gitlab_flow.md                     |   2 +-
 .../settings/instance_template_repository.md  |   2 +-
 .../settings/push_event_activities_limit.md   |   2 +-
 doc/user/asciidoc.md                          |   2 +-
 doc/user/discussions/index.md                 |   4 +-
 doc/user/markdown.md                          |   2 +-
 doc/user/profile/account/create_accounts.md   |   2 +
 doc/user/project/autocomplete_characters.md   |   2 +-
 doc/user/project/badges.md                    |   2 +-
 doc/user/project/code_intelligence.md         |   2 +-
 doc/user/project/git_attributes.md            |   2 +-
 doc/user/project/highlighting.md              |   2 +-
 doc/user/project/index.md                     |   2 +-
 .../merge_requests/allow_collaboration.md     |   2 +-
 .../authorization_for_merge_requests.md       |   2 +-
 .../merge_requests/cherry_pick_changes.md     |   2 +-
 .../merge_requests/creating_merge_requests.md |   2 +-
 .../merge_requests/fast_forward_merge.md      |   2 +-
 .../project/merge_requests/getting_started.md |   2 +-
 doc/user/project/merge_requests/index.md      |   2 +-
 .../merge_when_pipeline_succeeds.md           |   2 +-
 .../merge_requests/resolve_conflicts.md       |   2 +-
 .../project/merge_requests/revert_changes.md  |   2 +-
 .../merge_requests/squash_and_merge.md        |   2 +-
 doc/user/project/protected_branches.md        |   2 +-
 doc/user/project/protected_tags.md            |   2 +-
 doc/user/project/push_options.md              |   2 +-
 doc/user/project/repository/branches/index.md |   2 +-
 .../project/repository/forking_workflow.md    |   2 +-
 doc/user/project/repository/git_blame.md      |   2 +-
 doc/user/project/repository/git_history.md    |   2 +-
 .../repository/gpg_signed_commits/index.md    |   2 +-
 doc/user/project/repository/index.md          |   2 +-
 .../repository/jupyter_notebooks/index.md     |   2 +-
 .../repository/repository_mirroring.md        |   2 +-
 .../repository/x509_signed_commits/index.md   |   2 +-
 doc/user/project/service_desk.md              |   2 +-
 doc/user/project/settings/index.md            |   2 +-
 doc/user/project/working_with_projects.md     |   2 +-
 lib/gitlab/ci/features.rb                     |   2 +-
 .../ci_template_unique_counter.rb             |   1 +
 .../known_events/common.yml                   |   5 +
 scripts/lint-doc.sh                           |   4 +-
 .../container_repositories_finder_spec.rb     |  30 +++++
 .../components/group_settings_app_spec.js     |  76 +++++++----
 .../container_repositories_resolver_spec.rb   |  28 +++++
 .../container_repository_sort_enum_spec.rb    |  15 +++
 spec/models/pages/lookup_path_spec.rb         |  57 ++++-----
 spec/models/pages_deployment_spec.rb          |  40 ++++++
 .../project/container_repositories_spec.rb    |  47 +++++++
 spec/services/ci/register_job_service_spec.rb |  16 +++
 .../vulnerabilities_findings_helper.rb        | 118 ++++++++++++++++++
 117 files changed, 711 insertions(+), 160 deletions(-)
 create mode 100644 app/graphql/types/container_repository_sort_enum.rb
 create mode 100644 changelogs/unreleased/290302-sort-container-repositories.yml
 create mode 100644 changelogs/unreleased/gl-button-empty-issue-placeholder.yml
 create mode 100644 changelogs/unreleased/track-5-mins-prod-app-usage.yml
 create mode 100644 spec/graphql/types/container_repository_sort_enum_spec.rb
 create mode 100644 spec/support/migrations_helpers/vulnerabilities_findings_helper.rb

diff --git a/app/assets/javascripts/packages_and_registries/settings/group/bundle.js b/app/assets/javascripts/packages_and_registries/settings/group/bundle.js
index b2ff75fe1bd..1bf2336a1f4 100644
--- a/app/assets/javascripts/packages_and_registries/settings/group/bundle.js
+++ b/app/assets/javascripts/packages_and_registries/settings/group/bundle.js
@@ -1,10 +1,13 @@
 import Vue from 'vue';
+import { GlToast } from '@gitlab/ui';
+
 import Translate from '~/vue_shared/translate';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import SettingsApp from './components/group_settings_app.vue';
 import { apolloProvider } from './graphql';
 
 Vue.use(Translate);
+Vue.use(GlToast);
 
 export default () => {
   const el = document.getElementById('js-packages-and-registries-settings');
diff --git a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue
index 71f683a1761..da90b7290e1 100644
--- a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue
+++ b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue
@@ -1,6 +1,5 @@
 <script>
-import { GlSprintf, GlLink } from '@gitlab/ui';
-import createFlash from '~/flash';
+import { GlSprintf, GlLink, GlAlert } from '@gitlab/ui';
 import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue';
 import MavenSettings from '~/packages_and_registries/settings/group/components/maven_settings.vue';
 
@@ -26,6 +25,7 @@ export default {
     PACKAGES_DOCS_PATH,
   },
   components: {
+    GlAlert,
     GlSprintf,
     GlLink,
     SettingsBlock,
@@ -49,6 +49,7 @@ export default {
     return {
       packageSettings: {},
       errors: {},
+      alertMessage: null,
     };
   },
   computed: {
@@ -57,6 +58,9 @@ export default {
     },
   },
   methods: {
+    dismissAlert() {
+      this.alertMessage = null;
+    },
     updateSettings(payload) {
       this.errors = {};
       return this.$apollo
@@ -76,9 +80,10 @@ export default {
         })
         .then(({ data }) => {
           if (data.updateNamespacePackageSettings?.errors?.length > 0) {
-            createFlash({ message: ERROR_UPDATING_SETTINGS, type: 'warning' });
+            this.alertMessage = ERROR_UPDATING_SETTINGS;
           } else {
-            createFlash({ message: SUCCESS_UPDATING_SETTINGS, type: 'success' });
+            this.dismissAlert();
+            this.$toast.show(SUCCESS_UPDATING_SETTINGS, { type: 'success' });
           }
         })
         .catch((e) => {
@@ -93,7 +98,7 @@ export default {
               this.errors = { ...this.errors, [key]: message };
             });
           }
-          createFlash({ message: ERROR_UPDATING_SETTINGS, type: 'warning' });
+          this.alertMessage = ERROR_UPDATING_SETTINGS;
         });
     },
   },
@@ -102,6 +107,10 @@ export default {
 
 <template>
   <div>
+    <gl-alert v-if="alertMessage" variant="warning" class="gl-mt-4" @dismiss="dismissAlert">
+      {{ alertMessage }}
+    </gl-alert>
+
     <settings-block :default-expanded="defaultExpanded">
       <template #title> {{ $options.i18n.PACKAGE_SETTINGS_HEADER }}</template>
       <template #description>
diff --git a/app/finders/container_repositories_finder.rb b/app/finders/container_repositories_finder.rb
index 5109efb361b..14e4d6799d8 100644
--- a/app/finders/container_repositories_finder.rb
+++ b/app/finders/container_repositories_finder.rb
@@ -14,7 +14,8 @@ class ContainerRepositoriesFinder
     return unless authorized?
 
     repositories = @subject.is_a?(Project) ? project_repositories : group_repositories
-    filter_by_image_name(repositories)
+    repositories = filter_by_image_name(repositories)
+    sort(repositories)
   end
 
   private
@@ -39,6 +40,12 @@ class ContainerRepositoriesFinder
     repositories.search_by_name(@params[:name])
   end
 
+  def sort(repositories)
+    return repositories unless @params[:sort]
+
+    repositories.order_by(@params[:sort])
+  end
+
   def authorized?
     Ability.allowed?(@user, :read_container_image, @subject)
   end
diff --git a/app/graphql/resolvers/container_repositories_resolver.rb b/app/graphql/resolvers/container_repositories_resolver.rb
index 8042a368e33..17af2a2f070 100644
--- a/app/graphql/resolvers/container_repositories_resolver.rb
+++ b/app/graphql/resolvers/container_repositories_resolver.rb
@@ -10,8 +10,13 @@ module Resolvers
               required: false,
               description: 'Filter the container repositories by their name.'
 
-    def resolve(name: nil)
-      ContainerRepositoriesFinder.new(user: current_user, subject: object, params: { name: name })
+    argument :sort, Types::ContainerRepositorySortEnum,
+             description: 'Sort container repositories by this criteria.',
+             required: false,
+             default_value: :created_desc
+
+    def resolve(name: nil, sort: nil)
+      ContainerRepositoriesFinder.new(user: current_user, subject: object, params: { name: name, sort: sort })
                                  .execute
                                  .tap { track_event(:list_repositories, :container) }
     end
diff --git a/app/graphql/types/container_repository_sort_enum.rb b/app/graphql/types/container_repository_sort_enum.rb
new file mode 100644
index 00000000000..96210c0546b
--- /dev/null
+++ b/app/graphql/types/container_repository_sort_enum.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Types
+  class ContainerRepositorySortEnum < SortEnum
+    graphql_name 'ContainerRepositorySort'
+    description 'Values for sorting container repositories'
+
+    value 'NAME_ASC', 'Name by ascending order', value: :name_asc
+    value 'NAME_DESC', 'Name by descending order', value: :name_desc
+  end
+end
diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb
index 0d7ce966537..e2bdf8ffce2 100644
--- a/app/models/container_repository.rb
+++ b/app/models/container_repository.rb
@@ -4,6 +4,7 @@ class ContainerRepository < ApplicationRecord
   include Gitlab::Utils::StrongMemoize
   include Gitlab::SQL::Pattern
   include EachBatch
+  include Sortable
 
   WAITING_CLEANUP_STATUSES = %i[cleanup_scheduled cleanup_unfinished].freeze
 
diff --git a/app/models/note.rb b/app/models/note.rb
index 77f7726079c..92b5b4e4e5e 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -542,7 +542,7 @@ class Note < ApplicationRecord
   end
 
   def skip_notification?
-    review.present?
+    review.present? || author.ghost?
   end
 
   private
diff --git a/app/models/pages/lookup_path.rb b/app/models/pages/lookup_path.rb
index fa2d7bb316c..c6781f8f6e3 100644
--- a/app/models/pages/lookup_path.rb
+++ b/app/models/pages/lookup_path.rb
@@ -5,7 +5,6 @@ module Pages
     include Gitlab::Utils::StrongMemoize
 
     LegacyStorageDisabledError = Class.new(::StandardError)
-    MIGRATED_FILE_NAME = "_migrated.zip"
 
     def initialize(project, trim_prefix: nil, domain: nil)
       @project = project
@@ -55,7 +54,7 @@ module Pages
 
       return if deployment.file.file_storage? && !Feature.enabled?(:pages_serve_with_zip_file_protocol, project)
 
-      return if deployment.file.filename == MIGRATED_FILE_NAME && !Feature.enabled?(:pages_serve_from_migrated_zip, project)
+      return if deployment.migrated? && !Feature.enabled?(:pages_serve_from_migrated_zip, project)
 
       global_id = ::Gitlab::GlobalId.build(deployment, id: deployment.id).to_s
 
diff --git a/app/models/pages_deployment.rb b/app/models/pages_deployment.rb
index 61818a63764..95949eeed9a 100644
--- a/app/models/pages_deployment.rb
+++ b/app/models/pages_deployment.rb
@@ -4,12 +4,15 @@
 class PagesDeployment < ApplicationRecord
   include FileStoreMounter
 
+  MIGRATED_FILE_NAME = "_migrated.zip"
+
   attribute :file_store, :integer, default: -> { ::Pages::DeploymentUploader.default_store }
 
   belongs_to :project, optional: false
   belongs_to :ci_build, class_name: 'Ci::Build', optional: true
 
   scope :older_than, -> (id) { where('id < ?', id) }
+  scope :migrated_from_legacy_storage, -> { where(file: MIGRATED_FILE_NAME) }
 
   validates :file, presence: true
   validates :file_store, presence: true, inclusion: { in: ObjectStorage::SUPPORTED_STORES }
@@ -25,6 +28,10 @@ class PagesDeployment < ApplicationRecord
     # this is to be adressed in https://gitlab.com/groups/gitlab-org/-/epics/589
   end
 
+  def migrated?
+    file.filename == MIGRATED_FILE_NAME
+  end
+
   private
 
   def set_size
diff --git a/app/views/projects/issues/import_csv/_button.html.haml b/app/views/projects/issues/import_csv/_button.html.haml
index e60460687a9..c2a825e0f69 100644
--- a/app/views/projects/issues/import_csv/_button.html.haml
+++ b/app/views/projects/issues/import_csv/_button.html.haml
@@ -2,7 +2,7 @@
 - can_edit = can?(current_user, :admin_project, @project)
 
 .dropdown.btn-group
-  %button.btn.gl-button.rounded-right.text-center{ class: ('has-tooltip' if type == :icon), title: (_('Import issues') if type == :icon),
+  %button.btn.gl-button.btn-default.rounded-right.text-center{ class: ('has-tooltip' if type == :icon), title: (_('Import issues') if type == :icon),
     data: { toggle: 'dropdown', qa_selector: 'import_issues_button' }, 'aria-label' => _('Import issues'), 'aria-haspopup' => 'true', 'aria-expanded' => 'false' }
     - if type == :icon
       = sprite_icon('import')
diff --git a/app/views/shared/empty_states/_issues.html.haml b/app/views/shared/empty_states/_issues.html.haml
index 8c5319e2178..997bc7b8a98 100644
--- a/app/views/shared/empty_states/_issues.html.haml
+++ b/app/views/shared/empty_states/_issues.html.haml
@@ -42,7 +42,7 @@
             - if project_select_button
               = render 'shared/new_project_item_select', path: 'issues/new', label: _('New issue'), type: :issues, with_feature_enabled: 'issues'
             - else
-              = link_to _('New issue'), button_path, class: 'btn btn-success', id: 'new_issue_link'
+              = link_to _('New issue'), button_path, class: 'btn gl-button btn-success', id: 'new_issue_link'
 
             - if show_import_button
               = render 'projects/issues/import_csv/button', type: :text
diff --git a/app/workers/new_note_worker.rb b/app/workers/new_note_worker.rb
index dd74deec63b..2bb2d0db55c 100644
--- a/app/workers/new_note_worker.rb
+++ b/app/workers/new_note_worker.rb
@@ -13,7 +13,7 @@ class NewNoteWorker # rubocop:disable Scalability/IdempotentWorker
   # rubocop: disable CodeReuse/ActiveRecord
   def perform(note_id, _params = {})
     if note = Note.find_by(id: note_id)
-      NotificationService.new.new_note(note) unless note.skip_notification? || note.author.ghost?
+      NotificationService.new.new_note(note) unless note.skip_notification?
       Notes::PostProcessService.new(note).execute
     else
       Gitlab::AppLogger.error("NewNoteWorker: couldn't find note with ID=#{note_id}, skipping job")
diff --git a/changelogs/unreleased/290302-sort-container-repositories.yml b/changelogs/unreleased/290302-sort-container-repositories.yml
new file mode 100644
index 00000000000..71f409aa259
--- /dev/null
+++ b/changelogs/unreleased/290302-sort-container-repositories.yml
@@ -0,0 +1,5 @@
+---
+title: Add sort argument to container_repositories graphql resolver
+merge_request: 53404
+author:
+type: changed
diff --git a/changelogs/unreleased/gl-button-empty-issue-placeholder.yml b/changelogs/unreleased/gl-button-empty-issue-placeholder.yml
new file mode 100644
index 00000000000..a40c63fe36e
--- /dev/null
+++ b/changelogs/unreleased/gl-button-empty-issue-placeholder.yml
@@ -0,0 +1,5 @@
+---
+title: Apply new GitLab UI for buttons in empty issue placeholder
+merge_request: 53554
+author: Yogi (@yo)
+type: other
diff --git a/changelogs/unreleased/track-5-mins-prod-app-usage.yml b/changelogs/unreleased/track-5-mins-prod-app-usage.yml
new file mode 100644
index 00000000000..db6eb85e9fd
--- /dev/null
+++ b/changelogs/unreleased/track-5-mins-prod-app-usage.yml
@@ -0,0 +1,5 @@
+---
+title: Track 5 mins production app template usage
+merge_request: 53618
+author:
+type: other
diff --git a/doc/administration/file_hooks.md b/doc/administration/file_hooks.md
index cfaeda546cc..1d028b80257 100644
--- a/doc/administration/file_hooks.md
+++ b/doc/administration/file_hooks.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
 
-# File hooks
+# File hooks **(FREE)**
 
 > - Introduced in GitLab 10.6.
 > - Until GitLab 12.8, the feature name was Plugins.
diff --git a/doc/administration/git_protocol.md b/doc/administration/git_protocol.md
index e034314f6ce..6a13f90f2c9 100644
--- a/doc/administration/git_protocol.md
+++ b/doc/administration/git_protocol.md
@@ -6,7 +6,7 @@ type: reference
 description: "Set and configure Git protocol v2"
 ---
 
-# Configuring Git Protocol v2
+# Configuring Git Protocol v2 **(FREE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/46555) in GitLab 11.4.
 > - [Temporarily disabled](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/55769) in GitLab 11.5.8, 11.6.6, 11.7.1, and 11.8+.
diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md
index 5f6222f1169..dbbe17cccc8 100644
--- a/doc/administration/integration/plantuml.md
+++ b/doc/administration/integration/plantuml.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# PlantUML & GitLab
+# PlantUML & GitLab **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8537) in GitLab 8.16.
 
diff --git a/doc/administration/invalidate_markdown_cache.md b/doc/administration/invalidate_markdown_cache.md
index 266e9d44ff7..211316534ee 100644
--- a/doc/administration/invalidate_markdown_cache.md
+++ b/doc/administration/invalidate_markdown_cache.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
 
-# Invalidate Markdown Cache
+# Invalidate Markdown Cache **(FREE)**
 
 For performance reasons, GitLab caches the HTML version of Markdown text
 in fields like comments, issue descriptions, and merge request descriptions. These
diff --git a/doc/api/branches.md b/doc/api/branches.md
index 74383841272..e9e27a358f0 100644
--- a/doc/api/branches.md
+++ b/doc/api/branches.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Branches API
+# Branches API **(FREE)**
 
 This API operates on [repository branches](../user/project/repository/branches/index.md).
 
diff --git a/doc/api/commits.md b/doc/api/commits.md
index 81014956fc5..a0f313d443c 100644
--- a/doc/api/commits.md
+++ b/doc/api/commits.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Commits API
+# Commits API **(FREE)**
 
 ## List repository commits
 
diff --git a/doc/api/discussions.md b/doc/api/discussions.md
index a7a53987fe9..60cfc2a47ca 100644
--- a/doc/api/discussions.md
+++ b/doc/api/discussions.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, api
 ---
 
-# Discussions API
+# Discussions API **(FREE)**
 
 Discussions are a set of related notes on:
 
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index f507d0fe0dd..1e15a20390d 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -4427,6 +4427,61 @@ Identifier of ContainerRepository.
 """
 scalar ContainerRepositoryID
 
+"""
+Values for sorting container repositories
+"""
+enum ContainerRepositorySort {
+  """
+  Created at ascending order
+  """
+  CREATED_ASC
+
+  """
+  Created at descending order
+  """
+  CREATED_DESC
+
+  """
+  Name by ascending order
+  """
+  NAME_ASC
+
+  """
+  Name by descending order
+  """
+  NAME_DESC
+
+  """
+  Updated at ascending order
+  """
+  UPDATED_ASC
+
+  """
+  Updated at descending order
+  """
+  UPDATED_DESC
+
+  """
+  Created at ascending order
+  """
+  created_asc @deprecated(reason: "Use CREATED_ASC. Deprecated in 13.5.")
+
+  """
+  Created at descending order
+  """
+  created_desc @deprecated(reason: "Use CREATED_DESC. Deprecated in 13.5.")
+
+  """
+  Updated at ascending order
+  """
+  updated_asc @deprecated(reason: "Use UPDATED_ASC. Deprecated in 13.5.")
+
+  """
+  Updated at descending order
+  """
+  updated_desc @deprecated(reason: "Use UPDATED_DESC. Deprecated in 13.5.")
+}
+
 """
 Status of a container repository
 """
@@ -10650,6 +10705,11 @@ type Group {
     Filter the container repositories by their name.
     """
     name: String
+
+    """
+    Sort container repositories by this criteria.
+    """
+    sort: ContainerRepositorySort = created_desc
   ): ContainerRepositoryConnection
 
   """
@@ -18690,6 +18750,11 @@ type Project {
     Filter the container repositories by their name.
     """
     name: String
+
+    """
+    Sort container repositories by this criteria.
+    """
+    sort: ContainerRepositorySort = created_desc
   ): ContainerRepositoryConnection
 
   """
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index cbbfb3f3e8a..8435194b1bc 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -12061,6 +12061,77 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "ENUM",
+          "name": "ContainerRepositorySort",
+          "description": "Values for sorting container repositories",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "updated_desc",
+              "description": "Updated at descending order",
+              "isDeprecated": true,
+              "deprecationReason": "Use UPDATED_DESC. Deprecated in 13.5."
+            },
+            {
+              "name": "updated_asc",
+              "description": "Updated at ascending order",
+              "isDeprecated": true,
+              "deprecationReason": "Use UPDATED_ASC. Deprecated in 13.5."
+            },
+            {
+              "name": "created_desc",
+              "description": "Created at descending order",
+              "isDeprecated": true,
+              "deprecationReason": "Use CREATED_DESC. Deprecated in 13.5."
+            },
+            {
+              "name": "created_asc",
+              "description": "Created at ascending order",
+              "isDeprecated": true,
+              "deprecationReason": "Use CREATED_ASC. Deprecated in 13.5."
+            },
+            {
+              "name": "UPDATED_DESC",
+              "description": "Updated at descending order",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "UPDATED_ASC",
+              "description": "Updated at ascending order",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "CREATED_DESC",
+              "description": "Created at descending order",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "CREATED_ASC",
+              "description": "Created at ascending order",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "NAME_ASC",
+              "description": "Name by ascending order",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "NAME_DESC",
+              "description": "Name by descending order",
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
         {
           "kind": "ENUM",
           "name": "ContainerRepositoryStatus",
@@ -29330,6 +29401,16 @@
                   },
                   "defaultValue": null
                 },
+                {
+                  "name": "sort",
+                  "description": "Sort container repositories by this criteria.",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "ContainerRepositorySort",
+                    "ofType": null
+                  },
+                  "defaultValue": "created_desc"
+                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -54963,6 +55044,16 @@
                   },
                   "defaultValue": null
                 },
+                {
+                  "name": "sort",
+                  "description": "Sort container repositories by this criteria.",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "ContainerRepositorySort",
+                    "ofType": null
+                  },
+                  "defaultValue": "created_desc"
+                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 648f08ff8a1..c75671bf797 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -4698,6 +4698,23 @@ Status of the tags cleanup of a container repository.
 | `UNFINISHED` | The tags cleanup has been partially executed. There are still remaining tags to delete. |
 | `UNSCHEDULED` | The tags cleanup is not scheduled. This is the default state. |
 
+### ContainerRepositorySort
+
+Values for sorting container repositories.
+
+| Value | Description |
+| ----- | ----------- |
+| `CREATED_ASC` | Created at ascending order |
+| `CREATED_DESC` | Created at descending order |
+| `NAME_ASC` | Name by ascending order |
+| `NAME_DESC` | Name by descending order |
+| `UPDATED_ASC` | Updated at ascending order |
+| `UPDATED_DESC` | Updated at descending order |
+| `created_asc` **{warning-solid}** | **Deprecated:** Use CREATED_ASC. Deprecated in 13.5. |
+| `created_desc` **{warning-solid}** | **Deprecated:** Use CREATED_DESC. Deprecated in 13.5. |
+| `updated_asc` **{warning-solid}** | **Deprecated:** Use UPDATED_ASC. Deprecated in 13.5. |
+| `updated_desc` **{warning-solid}** | **Deprecated:** Use UPDATED_DESC. Deprecated in 13.5. |
+
 ### ContainerRepositoryStatus
 
 Status of a container repository.
diff --git a/doc/api/keys.md b/doc/api/keys.md
index dccea1f0e0a..98159bcf027 100644
--- a/doc/api/keys.md
+++ b/doc/api/keys.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Keys API
+# Keys API **(FREE)**
 
 ## Get SSH key with user by ID of an SSH key
 
diff --git a/doc/api/markdown.md b/doc/api/markdown.md
index c7908f02b6e..157714c2791 100644
--- a/doc/api/markdown.md
+++ b/doc/api/markdown.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Markdown API
+# Markdown API **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18926) in GitLab 11.0.
 
diff --git a/doc/api/merge_request_context_commits.md b/doc/api/merge_request_context_commits.md
index 3873cb00033..0b4b96b889b 100644
--- a/doc/api/merge_request_context_commits.md
+++ b/doc/api/merge_request_context_commits.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Merge request context commits API
+# Merge request context commits API **(FREE)**
 
 ## List MR context commits
 
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 1a768037015..cd447ed1b86 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Merge requests API
+# Merge requests API **(FREE)**
 
 > - `author_id`, `author_username`, and `assignee_id` were [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13060) in GitLab 9.5.
 > - `my_reaction_emoji` was [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14016) in GitLab 10.0.
diff --git a/doc/api/project_badges.md b/doc/api/project_badges.md
index 331d05e0d6d..041f67157f7 100644
--- a/doc/api/project_badges.md
+++ b/doc/api/project_badges.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Project badges API
+# Project badges API **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17082) in GitLab 10.6.
 
diff --git a/doc/api/project_import_export.md b/doc/api/project_import_export.md
index f737dd6d46c..cd8adf49f1d 100644
--- a/doc/api/project_import_export.md
+++ b/doc/api/project_import_export.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Project import/export API
+# Project import/export API **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41899) in GitLab 10.6.
 
diff --git a/doc/api/project_statistics.md b/doc/api/project_statistics.md
index 984720ed56f..6a987b60f64 100644
--- a/doc/api/project_statistics.md
+++ b/doc/api/project_statistics.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Project statistics API
+# Project statistics API **(FREE)**
 
 Every API call to [project](../user/project/index.md) statistics must be authenticated.
 
diff --git a/doc/api/project_templates.md b/doc/api/project_templates.md
index 6c423f0b058..1f96ee22211 100644
--- a/doc/api/project_templates.md
+++ b/doc/api/project_templates.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Project templates API
+# Project templates API **(FREE)**
 
 This API is a project-specific version of these endpoints:
 
diff --git a/doc/api/protected_branches.md b/doc/api/protected_branches.md
index 9ff4e374311..12ba40d5df5 100644
--- a/doc/api/protected_branches.md
+++ b/doc/api/protected_branches.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Protected branches API
+# Protected branches API **(FREE)**
 
 > Introduced in GitLab 9.5.
 
diff --git a/doc/api/protected_tags.md b/doc/api/protected_tags.md
index 87bd7043121..63fa7183aab 100644
--- a/doc/api/protected_tags.md
+++ b/doc/api/protected_tags.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Protected tags API
+# Protected tags API **(FREE)**
 
 > Introduced in GitLab 11.3.
 
diff --git a/doc/api/remote_mirrors.md b/doc/api/remote_mirrors.md
index c40aed534d5..638d4a3b917 100644
--- a/doc/api/remote_mirrors.md
+++ b/doc/api/remote_mirrors.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Project remote mirrors API
+# Project remote mirrors API **(FREE)**
 
 [Push mirrors](../user/project/repository/repository_mirroring.md#pushing-to-a-remote-repository)
 defined on a project's repository settings are called "remote mirrors", and the
diff --git a/doc/api/repository_files.md b/doc/api/repository_files.md
index ce11e5a38b7..19684b4ac0e 100644
--- a/doc/api/repository_files.md
+++ b/doc/api/repository_files.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Repository files API
+# Repository files API **(FREE)**
 
 **CRUD for repository files**
 
diff --git a/doc/api/repository_submodules.md b/doc/api/repository_submodules.md
index 9c59920df77..c014bb44861 100644
--- a/doc/api/repository_submodules.md
+++ b/doc/api/repository_submodules.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Repository submodules API
+# Repository submodules API **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41213) in GitLab 11.5
 
diff --git a/doc/api/search.md b/doc/api/search.md
index 6f27b5af0b8..9e1407fdffd 100644
--- a/doc/api/search.md
+++ b/doc/api/search.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Search API
+# Search API **(FREE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41763) in GitLab 10.5.
 > - [Feature flag `search_filter_by_confidential` removed](https://gitlab.com/gitlab-org/gitlab/-/issues/244923) in GitLab 13.6.
diff --git a/doc/api/suggestions.md b/doc/api/suggestions.md
index dd4340b0560..0fcb6122505 100644
--- a/doc/api/suggestions.md
+++ b/doc/api/suggestions.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Suggest Changes API
+# Suggest Changes API **(FREE)**
 
 Every API call to suggestions must be authenticated.
 
diff --git a/doc/api/tags.md b/doc/api/tags.md
index 262f5eb0010..eef4504aa5b 100644
--- a/doc/api/tags.md
+++ b/doc/api/tags.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Tags API
+# Tags API **(FREE)**
 
 ## List project repository tags
 
diff --git a/doc/development/approval_rules.md b/doc/development/approval_rules.md
index eae221c6598..368987eb85f 100644
--- a/doc/development/approval_rules.md
+++ b/doc/development/approval_rules.md
@@ -4,7 +4,7 @@ group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Approval Rules development guide
+# Approval Rules development guide **(FREE)**
 
 This document explains the backend design and flow of all related functionality
 about [merge request approval rules](../user/project/merge_requests/merge_request_approvals.md).
diff --git a/doc/development/code_intelligence/index.md b/doc/development/code_intelligence/index.md
index 02f701645f4..ac962e3ae3e 100644
--- a/doc/development/code_intelligence/index.md
+++ b/doc/development/code_intelligence/index.md
@@ -4,7 +4,7 @@ group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Code Intelligence
+# Code Intelligence **(FREE)**
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/1576) in GitLab 13.1.
 
diff --git a/doc/development/documentation/index.md b/doc/development/documentation/index.md
index 9b1b96a8323..b878f0fc1ce 100644
--- a/doc/development/documentation/index.md
+++ b/doc/development/documentation/index.md
@@ -207,7 +207,7 @@ To add a redirect:
    1. Assign the MR to a technical writer for review and merge.
 1. If the redirect is to one of the 4 internal docs projects (not an external URL),
    create an MR in [`gitlab-docs`](https://gitlab.com/gitlab-org/gitlab-docs):
-   1. Update [`redirects.yaml`](https://gitlab.com/gitlab-org/gitlab-docs/-/blob/master/content/_data/redirects.yaml)
+   1. Update [`content/_data/redirects.yaml`](https://gitlab.com/gitlab-org/gitlab-docs/-/blob/master/content/_data/redirects.yaml)
       with one redirect entry for each renamed or moved file. This code works for
       <https://docs.gitlab.com> links only. Keep them alphabetically sorted:
 
diff --git a/doc/development/internal_api.md b/doc/development/internal_api.md
index 54dac55292c..dce0877b1b7 100644
--- a/doc/development/internal_api.md
+++ b/doc/development/internal_api.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, api
 ---
 
-# Internal API
+# Internal API **(FREE)**
 
 The internal API is used by different GitLab components, it can not be
 used by other consumers. This documentation is intended for people
diff --git a/doc/development/lfs.md b/doc/development/lfs.md
index eeeebd52ecb..9b78c8869b1 100644
--- a/doc/development/lfs.md
+++ b/doc/development/lfs.md
@@ -4,7 +4,7 @@ group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Git LFS
+# Git LFS **(FREE)**
 
 ## Deep Dive
 
diff --git a/doc/development/new_fe_guide/modules/widget_extensions.md b/doc/development/new_fe_guide/modules/widget_extensions.md
index 375baea0444..d1f6099e908 100644
--- a/doc/development/new_fe_guide/modules/widget_extensions.md
+++ b/doc/development/new_fe_guide/modules/widget_extensions.md
@@ -4,7 +4,7 @@ group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Merge request widget extensions
+# Merge request widget extensions **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44616) in GitLab 13.6.
 
diff --git a/doc/gitlab-basics/README.md b/doc/gitlab-basics/README.md
index e0d0917db7c..8052fd27bb3 100644
--- a/doc/gitlab-basics/README.md
+++ b/doc/gitlab-basics/README.md
@@ -6,7 +6,7 @@ comments: false
 type: index
 ---
 
-# GitLab basics guides
+# GitLab basics guides **(FREE)**
 
 This section provides resources to help you start working with GitLab and Git by focusing
 on the basic features that you will need to use.
diff --git a/doc/gitlab-basics/add-file.md b/doc/gitlab-basics/add-file.md
index 4afeb5ce83b..33db7d74949 100644
--- a/doc/gitlab-basics/add-file.md
+++ b/doc/gitlab-basics/add-file.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: howto
 ---
 
-# Add a file to a repository
+# Add a file to a repository **(FREE)**
 
 Adding files to a repository is a small, but key task. Bringing files in to a repository,
 such as code, images, or documents, allows them to be tracked by Git, even though they
diff --git a/doc/gitlab-basics/command-line-commands.md b/doc/gitlab-basics/command-line-commands.md
index c747c33a480..52facc7bd1a 100644
--- a/doc/gitlab-basics/command-line-commands.md
+++ b/doc/gitlab-basics/command-line-commands.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: howto, reference
 ---
 
-# Edit files through the command line
+# Edit files through the command line **(FREE)**
 
 When [working with Git from the command line](start-using-git.md), you need to
 use more than just the Git commands. There are several basic commands that you should
diff --git a/doc/gitlab-basics/create-branch.md b/doc/gitlab-basics/create-branch.md
index 3697ae34bf9..9f4f46e5bd3 100644
--- a/doc/gitlab-basics/create-branch.md
+++ b/doc/gitlab-basics/create-branch.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: howto
 ---
 
-# How to create a branch
+# How to create a branch **(FREE)**
 
 A branch is an independent line of development in a [project](../user/project/index.md).
 
diff --git a/doc/gitlab-basics/feature_branch_workflow.md b/doc/gitlab-basics/feature_branch_workflow.md
index e02be390ab8..682bc1aec0b 100644
--- a/doc/gitlab-basics/feature_branch_workflow.md
+++ b/doc/gitlab-basics/feature_branch_workflow.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/workflow.html'
 ---
 
-# Feature branch workflow
+# Feature branch workflow **(FREE)**
 
 1. Clone project:
 
diff --git a/doc/gitlab-basics/start-using-git.md b/doc/gitlab-basics/start-using-git.md
index e88df5bb83f..a2d286379d2 100644
--- a/doc/gitlab-basics/start-using-git.md
+++ b/doc/gitlab-basics/start-using-git.md
@@ -6,7 +6,7 @@ type: howto, tutorial
 description: "Introduction to using Git through the command line."
 ---
 
-# Start using Git on the command line
+# Start using Git on the command line **(FREE)**
 
 [Git](https://git-scm.com/) is an open-source distributed version control system designed to
 handle everything from small to very large projects with speed and efficiency. GitLab is built
diff --git a/doc/integration/sourcegraph.md b/doc/integration/sourcegraph.md
index c64ef729e94..d068aabed41 100644
--- a/doc/integration/sourcegraph.md
+++ b/doc/integration/sourcegraph.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, how-to
 ---
 
-# Sourcegraph integration
+# Sourcegraph integration **(FREE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16556) in GitLab 12.5.
 > - Note that this integration is in BETA and deployed [behind a feature flag](#enable-the-sourcegraph-feature-flag) disabled by default. Self-managed instances can opt to enable it.
diff --git a/doc/intro/README.md b/doc/intro/README.md
index 64453750504..1ab7553d3a8 100644
--- a/doc/intro/README.md
+++ b/doc/intro/README.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 comments: false
 ---
 
-# Get started with GitLab
+# Get started with GitLab **(FREE)**
 
 ## Organize
 
diff --git a/doc/topics/git/feature_branch_development.md b/doc/topics/git/feature_branch_development.md
index c9fb81600d4..842c39f0bfd 100644
--- a/doc/topics/git/feature_branch_development.md
+++ b/doc/topics/git/feature_branch_development.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: how-tos
 ---
 
-# Develop on a feature branch
+# Develop on a feature branch **(FREE)**
 
 GitLab values encourage the use of [Minimal Viable Change (MVC)](https://about.gitlab.com/handbook/values/#minimal-viable-change-mvc).
 However, viable changes are not always small. In such cases, it can help to set up a dedicated feature branch.
diff --git a/doc/topics/git/git_rebase.md b/doc/topics/git/git_rebase.md
index 607d9affc22..bf77ba3272c 100644
--- a/doc/topics/git/git_rebase.md
+++ b/doc/topics/git/git_rebase.md
@@ -6,7 +6,7 @@ type: concepts, howto
 description: "Introduction to Git rebase, force-push, and resolving merge conflicts through the command line."
 ---
 
-# Introduction to Git rebase, force-push, and merge conflicts
+# Introduction to Git rebase, force-push, and merge conflicts **(FREE)**
 
 This guide helps you to get started with rebasing, force-pushing, and fixing
 merge conflicts locally.
diff --git a/doc/topics/git/how_to_install_git/index.md b/doc/topics/git/how_to_install_git/index.md
index 5979cad1c0e..17c5f31705f 100644
--- a/doc/topics/git/how_to_install_git/index.md
+++ b/doc/topics/git/how_to_install_git/index.md
@@ -6,7 +6,7 @@ description: 'This article describes how to install Git on macOS, Ubuntu Linux a
 type: howto
 ---
 
-# Installing Git
+# Installing Git **(FREE)**
 
 To begin contributing to GitLab projects,
 you will need to install the Git client on your computer.
diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md
index cc4e546a244..52e8a42de76 100644
--- a/doc/topics/git/index.md
+++ b/doc/topics/git/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: index
 ---
 
-# Git
+# Git **(FREE)**
 
 Git is a [free and open source](https://git-scm.com/about/free-and-open-source)
 distributed version control system designed to handle everything from small to
diff --git a/doc/topics/git/lfs/index.md b/doc/topics/git/lfs/index.md
index f4ea884563c..14bb28d2477 100644
--- a/doc/topics/git/lfs/index.md
+++ b/doc/topics/git/lfs/index.md
@@ -6,7 +6,7 @@ type: reference, howto
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/lfs/lfs/index.html'
 ---
 
-# Git Large File Storage (LFS)
+# Git Large File Storage (LFS) **(FREE)**
 
 Managing large files such as audio, video and graphics files has always been one
 of the shortcomings of Git. The general recommendation is to not have Git repositories
diff --git a/doc/topics/git/lfs/migrate_from_git_annex_to_git_lfs.md b/doc/topics/git/lfs/migrate_from_git_annex_to_git_lfs.md
index 771b0a465ec..3b3f1c0b46f 100644
--- a/doc/topics/git/lfs/migrate_from_git_annex_to_git_lfs.md
+++ b/doc/topics/git/lfs/migrate_from_git_annex_to_git_lfs.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# Migration guide from Git Annex to Git LFS
+# Migration guide from Git Annex to Git LFS **(FREE)**
 
 WARNING:
 Git Annex support [has been removed](https://gitlab.com/gitlab-org/gitlab/-/issues/1648) in GitLab Enterprise
diff --git a/doc/topics/git/numerous_undo_possibilities_in_git/index.md b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
index 6edbd29c236..c263609125f 100644
--- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md
+++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: howto
 ---
 
-# Numerous undo possibilities in Git
+# Numerous undo possibilities in Git **(FREE)**
 
 This tutorial shows you different ways of undoing your work in Git.
 We assume you have a basic working knowledge of Git. Check the GitLab
diff --git a/doc/topics/git/partial_clone.md b/doc/topics/git/partial_clone.md
index fa42cfd6e5b..d9c239486f5 100644
--- a/doc/topics/git/partial_clone.md
+++ b/doc/topics/git/partial_clone.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# Partial Clone
+# Partial Clone **(FREE)**
 
 As Git repositories grow in size, they can become cumbersome to work with
 because of the large amount of history that must be downloaded, and the large
diff --git a/doc/topics/git/troubleshooting_git.md b/doc/topics/git/troubleshooting_git.md
index 0724e503923..528a9a4ba00 100644
--- a/doc/topics/git/troubleshooting_git.md
+++ b/doc/topics/git/troubleshooting_git.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: howto
 ---
 
-# Troubleshooting Git
+# Troubleshooting Git **(FREE)**
 
 Sometimes things don't work the way they should or as you might expect when
 you're using Git. Here are some tips on troubleshooting and resolving issues
diff --git a/doc/topics/git/useful_git_commands.md b/doc/topics/git/useful_git_commands.md
index cef95746bb1..94279e521b6 100644
--- a/doc/topics/git/useful_git_commands.md
+++ b/doc/topics/git/useful_git_commands.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
 
-# Useful Git commands
+# Useful Git commands **(FREE)**
 
 The GitLab support team has collected these commands to help you. You may not
 need to use them often.
diff --git a/doc/topics/gitlab_flow.md b/doc/topics/gitlab_flow.md
index 97135e421f8..0e200eff3c1 100644
--- a/doc/topics/gitlab_flow.md
+++ b/doc/topics/gitlab_flow.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/gitlab_flow.html'
 ---
 
-# Introduction to GitLab Flow
+# Introduction to GitLab Flow **(FREE)**
 
 ![GitLab Flow](img/gitlab_flow.png)
 
diff --git a/doc/user/admin_area/settings/instance_template_repository.md b/doc/user/admin_area/settings/instance_template_repository.md
index 0b40e513133..6d633cfbffd 100644
--- a/doc/user/admin_area/settings/instance_template_repository.md
+++ b/doc/user/admin_area/settings/instance_template_repository.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
 
-# Instance template repository **(PREMIUM SELF)**
+# Instance template repository **(PREMIUM SELF)** **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/5986) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.3.
 
diff --git a/doc/user/admin_area/settings/push_event_activities_limit.md b/doc/user/admin_area/settings/push_event_activities_limit.md
index 484bb7b0a14..c109429216a 100644
--- a/doc/user/admin_area/settings/push_event_activities_limit.md
+++ b/doc/user/admin_area/settings/push_event_activities_limit.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
 
-# Push event activities limit and bulk push events
+# Push event activities limit and bulk push events **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31007) in GitLab 12.4.
 
diff --git a/doc/user/asciidoc.md b/doc/user/asciidoc.md
index e0128edf317..07593c98da9 100644
--- a/doc/user/asciidoc.md
+++ b/doc/user/asciidoc.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# AsciiDoc
+# AsciiDoc **(FREE)**
 
 GitLab uses the [Asciidoctor](https://asciidoctor.org) gem to convert AsciiDoc content to HTML5.
 Consult the [Asciidoctor User Manual](https://asciidoctor.org/docs/user-manual/) for a complete Asciidoctor reference.
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index 7af701534d3..0f718cfdb8d 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# Threads
+# Threads **(FREE)**
 
 The ability to contribute conversationally is offered throughout GitLab.
 
@@ -408,7 +408,7 @@ the merge request authored by the user that applied them.
 
 1. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/25381) in GitLab 13.9,
    you can opt to add a custom commit message to describe your change. If you don't
-   specify it, the default commit message will be used. Note that [this feature may not be available to you](#enable-or-disable-custom-commit-messages-for-suggestions). 
+   specify it, the default commit message will be used. Note that [this feature may not be available to you](#enable-or-disable-custom-commit-messages-for-suggestions).
    Also, it is not supported for [batch suggestions](#batch-suggestions).
 
    ![Custom commit](img/custom_commit_v13_9.png)
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index ff796409ada..afad68c5554 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# GitLab Markdown
+# GitLab Markdown **(FREE)**
 
 This Markdown guide is **valid only for the GitLab internal Markdown rendering system for entries and files**.
 It is **not** valid for the [GitLab documentation website](https://docs.gitlab.com)
diff --git a/doc/user/profile/account/create_accounts.md b/doc/user/profile/account/create_accounts.md
index 6f5ddf1d9bd..91688989e55 100644
--- a/doc/user/profile/account/create_accounts.md
+++ b/doc/user/profile/account/create_accounts.md
@@ -37,3 +37,5 @@ Users will be:
 
 - Automatically created upon first sign in with the [LDAP integration](../../../administration/auth/ldap/index.md).
 - Created when first signing in via an [OmniAuth provider](../../../integration/omniauth.md) if the `allow_single_sign_on` setting is present.
+- Created when first signing with [Group SAML](../../group/saml_sso/index.md)
+- Automatically created by [SCIM](../../group/saml_sso/scim_setup.md) when the user is created in the identity provider.
diff --git a/doc/user/project/autocomplete_characters.md b/doc/user/project/autocomplete_characters.md
index e3b52e99a89..0d234aff643 100644
--- a/doc/user/project/autocomplete_characters.md
+++ b/doc/user/project/autocomplete_characters.md
@@ -6,7 +6,7 @@ type: reference
 description: "Autocomplete chars in Markdown fields."
 ---
 
-# Autocomplete characters
+# Autocomplete characters **(FREE)**
 
 The autocomplete characters provide a quick way of entering field values into
 Markdown fields. When you start typing a word in a Markdown field with one of
diff --git a/doc/user/project/badges.md b/doc/user/project/badges.md
index f7bb88c33aa..7e6bba30001 100644
--- a/doc/user/project/badges.md
+++ b/doc/user/project/badges.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# Badges
+# Badges **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41174) in GitLab 10.7.
 
diff --git a/doc/user/project/code_intelligence.md b/doc/user/project/code_intelligence.md
index 19dc3588162..0e8c1bf8f4d 100644
--- a/doc/user/project/code_intelligence.md
+++ b/doc/user/project/code_intelligence.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
 
-# Code Intelligence
+# Code Intelligence **(FREE)**
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/1576) in GitLab 13.1.
 
diff --git a/doc/user/project/git_attributes.md b/doc/user/project/git_attributes.md
index 459abea455b..2806f6e48d1 100644
--- a/doc/user/project/git_attributes.md
+++ b/doc/user/project/git_attributes.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
 
-# Git Attributes
+# Git Attributes **(FREE)**
 
 GitLab supports defining custom [Git attributes](https://git-scm.com/docs/gitattributes) such as what
 files to treat as binary, and what language to use for syntax highlighting
diff --git a/doc/user/project/highlighting.md b/doc/user/project/highlighting.md
index 5ffc2878269..c914c90c923 100644
--- a/doc/user/project/highlighting.md
+++ b/doc/user/project/highlighting.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
 
-# Syntax Highlighting
+# Syntax Highlighting **(FREE)**
 
 GitLab provides syntax highlighting on all files through the [Rouge](https://rubygems.org/gems/rouge) Ruby gem. It attempts to guess what language to use based on the file extension, which most of the time is sufficient.
 
diff --git a/doc/user/project/index.md b/doc/user/project/index.md
index 640d0ac1f69..6230a992dbb 100644
--- a/doc/user/project/index.md
+++ b/doc/user/project/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
 
-# Projects
+# Projects **(FREE)**
 
 In GitLab, you can create projects for hosting
 your codebase, use it as an issue tracker, collaborate on code, and continuously
diff --git a/doc/user/project/merge_requests/allow_collaboration.md b/doc/user/project/merge_requests/allow_collaboration.md
index 89fbc4cd89e..f7b0cc3fa86 100644
--- a/doc/user/project/merge_requests/allow_collaboration.md
+++ b/doc/user/project/merge_requests/allow_collaboration.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, howto
 ---
 
-# Allow collaboration on merge requests across forks
+# Allow collaboration on merge requests across forks **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17395) in GitLab 10.6.
 
diff --git a/doc/user/project/merge_requests/authorization_for_merge_requests.md b/doc/user/project/merge_requests/authorization_for_merge_requests.md
index 7bb64987a31..36481ac0133 100644
--- a/doc/user/project/merge_requests/authorization_for_merge_requests.md
+++ b/doc/user/project/merge_requests/authorization_for_merge_requests.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: concepts
 ---
 
-# Authorization for Merge requests
+# Authorization for Merge requests **(FREE)**
 
 There are two main ways to have a merge request flow with GitLab:
 
diff --git a/doc/user/project/merge_requests/cherry_pick_changes.md b/doc/user/project/merge_requests/cherry_pick_changes.md
index 36fb5cea4b0..4c9a6557320 100644
--- a/doc/user/project/merge_requests/cherry_pick_changes.md
+++ b/doc/user/project/merge_requests/cherry_pick_changes.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
 
-# Cherry-pick changes
+# Cherry-pick changes **(FREE)**
 
 GitLab implements Git's powerful feature to
 [cherry-pick any commit](https://git-scm.com/docs/git-cherry-pick "Git cherry-pick documentation")
diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md
index e5d3954cb41..5cfedc6c9f1 100644
--- a/doc/user/project/merge_requests/creating_merge_requests.md
+++ b/doc/user/project/merge_requests/creating_merge_requests.md
@@ -7,7 +7,7 @@ description: "How to create Merge Requests in GitLab."
 disqus_identifier: 'https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html'
 ---
 
-# How to create a merge request
+# How to create a merge request **(FREE)**
 
 Before creating a merge request, read through an
 [introduction to Merge Requests](getting_started.md)
diff --git a/doc/user/project/merge_requests/fast_forward_merge.md b/doc/user/project/merge_requests/fast_forward_merge.md
index a89acff4bfc..c4a34f9c65c 100644
--- a/doc/user/project/merge_requests/fast_forward_merge.md
+++ b/doc/user/project/merge_requests/fast_forward_merge.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
 
-# Fast-forward merge requests
+# Fast-forward merge requests **(FREE)**
 
 Sometimes, a workflow policy might mandate a clean commit history without
 merge commits. In such cases, the fast-forward merge is the perfect candidate.
diff --git a/doc/user/project/merge_requests/getting_started.md b/doc/user/project/merge_requests/getting_started.md
index 60d041e74fd..92db8bb2618 100644
--- a/doc/user/project/merge_requests/getting_started.md
+++ b/doc/user/project/merge_requests/getting_started.md
@@ -6,7 +6,7 @@ type: index, reference
 description: "Getting started with Merge Requests."
 ---
 
-# Getting started with Merge Requests
+# Getting started with Merge Requests **(FREE)**
 
 A Merge Request (**MR**) is the basis of GitLab as a code
 collaboration and version control.
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index 6af6cad5cdd..8ccf50e48b8 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: index, reference
 ---
 
-# Merge requests
+# Merge requests **(FREE)**
 
 A Merge Request (**MR**) is a _request_ to _merge_ one branch into another.
 
diff --git a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
index 5efb8d9ff40..d33a8e40aac 100644
--- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
+++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
 
-# Merge when pipeline succeeds
+# Merge when pipeline succeeds **(FREE)**
 
 When reviewing a merge request that looks ready to merge but still has a
 pipeline running, you can set it to merge automatically when the
diff --git a/doc/user/project/merge_requests/resolve_conflicts.md b/doc/user/project/merge_requests/resolve_conflicts.md
index b2aedb7d95f..a53b5032e1d 100644
--- a/doc/user/project/merge_requests/resolve_conflicts.md
+++ b/doc/user/project/merge_requests/resolve_conflicts.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
 
-# Merge request conflict resolution
+# Merge request conflict resolution **(FREE)**
 
 Merge conflicts occur when two branches have different changes that cannot be
 merged automatically.
diff --git a/doc/user/project/merge_requests/revert_changes.md b/doc/user/project/merge_requests/revert_changes.md
index 40a4631694b..d5d0578c07c 100644
--- a/doc/user/project/merge_requests/revert_changes.md
+++ b/doc/user/project/merge_requests/revert_changes.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
 
-# Reverting changes
+# Reverting changes **(FREE)**
 
 You can use Git's powerful feature to [revert any commit](https://git-scm.com/docs/git-revert "Git revert documentation")
 by clicking the **Revert** button in merge requests and commit details.
diff --git a/doc/user/project/merge_requests/squash_and_merge.md b/doc/user/project/merge_requests/squash_and_merge.md
index 5311d833aec..1b99b1b5c44 100644
--- a/doc/user/project/merge_requests/squash_and_merge.md
+++ b/doc/user/project/merge_requests/squash_and_merge.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
 
-# Squash and merge
+# Squash and merge **(FREE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1024) in [GitLab Starter](https://about.gitlab.com/pricing/) 8.17.
 > - [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18956) from [GitLab Starter](https://about.gitlab.com/pricing/)to GitLab Free in 11.0.
diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md
index fa20f6b16c6..18168710a75 100644
--- a/doc/user/project/protected_branches.md
+++ b/doc/user/project/protected_branches.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# Protected branches
+# Protected branches **(FREE)**
 
 [Permissions](../permissions.md) in GitLab are fundamentally defined around the
 idea of having read or write permission to the repository and branches. To impose
diff --git a/doc/user/project/protected_tags.md b/doc/user/project/protected_tags.md
index a6f2d645198..3ea0bb62c0b 100644
--- a/doc/user/project/protected_tags.md
+++ b/doc/user/project/protected_tags.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# Protected tags
+# Protected tags **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10356) in GitLab 9.1.
 
diff --git a/doc/user/project/push_options.md b/doc/user/project/push_options.md
index 8af4307c013..f94a4075363 100644
--- a/doc/user/project/push_options.md
+++ b/doc/user/project/push_options.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# Push Options
+# Push Options **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/15643) in GitLab 11.7.
 
diff --git a/doc/user/project/repository/branches/index.md b/doc/user/project/repository/branches/index.md
index abe533172b9..4d0cf28593d 100644
--- a/doc/user/project/repository/branches/index.md
+++ b/doc/user/project/repository/branches/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: concepts, howto
 ---
 
-# Branches
+# Branches **(FREE)**
 
 A branch is a version of a project's working tree. You create a branch for each
 set of related changes you make. This keeps each set of changes separate from
diff --git a/doc/user/project/repository/forking_workflow.md b/doc/user/project/repository/forking_workflow.md
index f7da3629c23..1a5e169ec6b 100644
--- a/doc/user/project/repository/forking_workflow.md
+++ b/doc/user/project/repository/forking_workflow.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/forking_workflow.html'
 ---
 
-# Project forking workflow
+# Project forking workflow **(FREE)**
 
 Whenever possible, it's recommended to work in a common Git repository and use
 [branching strategies](../../../topics/gitlab_flow.md) to manage your work. However,
diff --git a/doc/user/project/repository/git_blame.md b/doc/user/project/repository/git_blame.md
index 4322c79daa7..81995291911 100644
--- a/doc/user/project/repository/git_blame.md
+++ b/doc/user/project/repository/git_blame.md
@@ -6,7 +6,7 @@ type: reference, howto
 description: "Documentation on Git file blame."
 ---
 
-# Git file blame
+# Git file blame **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/commit/39c657930625ddc3ac8a921f01ffc83acadce68f) in GitLab 2.5.
 
diff --git a/doc/user/project/repository/git_history.md b/doc/user/project/repository/git_history.md
index 51cc6bb3483..2e27cab4177 100644
--- a/doc/user/project/repository/git_history.md
+++ b/doc/user/project/repository/git_history.md
@@ -6,7 +6,7 @@ type: reference, howto
 description: "Documentation on Git file history."
 ---
 
-# Git file history
+# Git file history **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/blob/9ba1224867665844b117fa037e1465bb706b3685/app/controllers/commits_controller.rb) in GitLab 0.8.0
 
diff --git a/doc/user/project/repository/gpg_signed_commits/index.md b/doc/user/project/repository/gpg_signed_commits/index.md
index cd1d7a6c6d8..1a46c140507 100644
--- a/doc/user/project/repository/gpg_signed_commits/index.md
+++ b/doc/user/project/repository/gpg_signed_commits/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: concepts, howto
 ---
 
-# Signing commits with GPG
+# Signing commits with GPG **(FREE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9546) in GitLab 9.5.
 > - Subkeys support was added in GitLab 10.1.
diff --git a/doc/user/project/repository/index.md b/doc/user/project/repository/index.md
index c0b3ee24fa9..75934a1a814 100644
--- a/doc/user/project/repository/index.md
+++ b/doc/user/project/repository/index.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: concepts, howto
 ---
 
-# Repository
+# Repository **(FREE)**
 
 A [repository](https://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository)
 is what you use to store your codebase in GitLab and change it with version control.
diff --git a/doc/user/project/repository/jupyter_notebooks/index.md b/doc/user/project/repository/jupyter_notebooks/index.md
index 91fe9049b53..123df9097f9 100644
--- a/doc/user/project/repository/jupyter_notebooks/index.md
+++ b/doc/user/project/repository/jupyter_notebooks/index.md
@@ -4,7 +4,7 @@ group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments"
 type: reference
 ---
-# Jupyter Notebook Files
+# Jupyter Notebook Files **(FREE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/2508/) in GitLab 9.1.
 
diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md
index 1509b214abd..4d5e4a5ef02 100644
--- a/doc/user/project/repository/repository_mirroring.md
+++ b/doc/user/project/repository/repository_mirroring.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/repository_mirroring.html'
 ---
 
-# Repository mirroring
+# Repository mirroring **(FREE)**
 
 Repository mirroring allows for mirroring of repositories to and from external sources. It can be
 used to mirror branches, tags, and commits between repositories. It is useful when you want to use
diff --git a/doc/user/project/repository/x509_signed_commits/index.md b/doc/user/project/repository/x509_signed_commits/index.md
index 639bca0d354..29c1c32145d 100644
--- a/doc/user/project/repository/x509_signed_commits/index.md
+++ b/doc/user/project/repository/x509_signed_commits/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: concepts, howto
 ---
 
-# Signing commits and tags with X.509
+# Signing commits and tags with X.509 **(FREE)**
 
 [X.509](https://en.wikipedia.org/wiki/X.509) is a standard format for public key
 certificates issued by a public or private Public Key Infrastructure (PKI).
diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md
index e3ff675a87e..70ed6e70059 100644
--- a/doc/user/project/service_desk.md
+++ b/doc/user/project/service_desk.md
@@ -72,7 +72,7 @@ If you have project maintainer access you have the option to set up Service Desk
 
    WARNING:
    This email address can be used by anyone to create an issue on this project, regardless
-   of their access level to your GitLab instance. We recommend **putting this behind an alias** so it can be
+   of their access level to your GitLab instance. We recommend **putting this behind an alias on your email system** so it can be
    changed if needed. We also recommend **[enabling Akismet](../../integration/akismet.md)** on your GitLab
    instance to add spam checking to this service. Unblocked email spam would result in many spam
    issues being created.
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md
index fb492575c14..d8ecef61363 100644
--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, index, howto
 ---
 
-# Project settings
+# Project settings **(FREE)**
 
 NOTE:
 Only project maintainers and administrators have the [permissions](../../permissions.md#project-members-permissions)
diff --git a/doc/user/project/working_with_projects.md b/doc/user/project/working_with_projects.md
index 39a6d70fb9e..3fe6193c414 100644
--- a/doc/user/project/working_with_projects.md
+++ b/doc/user/project/working_with_projects.md
@@ -4,7 +4,7 @@ group: Source Code
 info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments"
 ---
 
-# Working with projects
+# Working with projects **(FREE)**
 
 Most work in GitLab is done in a [project](../../user/project/index.md). Files and
 code are saved in projects, and most features are in the scope of projects.
diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb
index 7155b60416b..f054f03b7b4 100644
--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
@@ -64,7 +64,7 @@ module Gitlab
       end
 
       def self.validate_build_dependencies?(project)
-        ::Feature.enabled?(:ci_validate_build_dependencies, default_enabled: :yaml) &&
+        ::Feature.enabled?(:ci_validate_build_dependencies, project, default_enabled: :yaml) &&
           ::Feature.disabled?(:ci_validate_build_dependencies_override, project)
       end
 
diff --git a/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb b/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
index 572ad866895..933e358509b 100644
--- a/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
@@ -5,6 +5,7 @@ module Gitlab::UsageDataCounters
     REDIS_SLOT = 'ci_templates'.freeze
 
     TEMPLATE_TO_EVENT = {
+      '5-Minute-Production-App.gitlab-ci.yml' => '5_min_production_app',
       'Auto-DevOps.gitlab-ci.yml' => 'auto_devops',
       'AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml' => 'aws_cf_deploy_ec2',
       'AWS/Deploy-ECS.gitlab-ci.yml' => 'aws_deploy_ecs',
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index c4ae67e7861..1828731a504 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -588,6 +588,11 @@
   aggregation: weekly
   feature_flag: usage_data_p_terraform_state_api_unique_users
 # CI templates
+- name: p_ci_templates_5_min_production_app
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
+  feature_flag: usage_data_track_ci_templates_unique_projects
 - name: p_ci_templates_auto_devops
   category: ci_templates
   redis_slot: ci_templates
diff --git a/scripts/lint-doc.sh b/scripts/lint-doc.sh
index 061af911839..17c8cdaabec 100755
--- a/scripts/lint-doc.sh
+++ b/scripts/lint-doc.sh
@@ -92,12 +92,12 @@ then
   echo "Merge request pipeline (detached) detected. Testing all files."
 else
   MERGE_BASE=$(git merge-base ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA} ${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA})
-  if git diff --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" | grep -E "\.vale|\.markdownlint|lint-doc\.sh"
+  if git diff --diff-filter=d --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" | grep -E "\.vale|\.markdownlint|lint-doc\.sh"
   then
     MD_DOC_PATH=${MD_DOC_PATH:-doc}
     echo "Vale, Markdownlint, or lint-doc.sh configuration changed. Testing all files."
   else
-    MD_DOC_PATH=$(git diff --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" 'doc/*.md')
+    MD_DOC_PATH=$(git diff --diff-filter=d --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" -- 'doc/*.md')
     if [ -n "${MD_DOC_PATH}" ]
     then
       echo -e "Merged results pipeline detected. Testing only the following files:\n${MD_DOC_PATH}"
diff --git a/spec/finders/container_repositories_finder_spec.rb b/spec/finders/container_repositories_finder_spec.rb
index b6305e3f5b7..983f6dba28b 100644
--- a/spec/finders/container_repositories_finder_spec.rb
+++ b/spec/finders/container_repositories_finder_spec.rb
@@ -32,6 +32,34 @@ RSpec.describe ContainerRepositoriesFinder do
     end
   end
 
+  shared_examples 'with sorting' do
+    let_it_be(:group) { create(:group) }
+    let_it_be(:project) { create(:project, group: group) }
+    let_it_be(:sort_repository) do
+      create(:container_repository, name: 'bar', project: project, created_at: 1.day.ago)
+    end
+
+    let_it_be(:sort_repository2) do
+      create(:container_repository, name: 'foo', project: project, created_at: 1.hour.ago, updated_at: 1.hour.ago)
+    end
+
+    [:created_desc, :updated_asc, :name_desc].each do |order|
+      context "with sort set to #{order}" do
+        let(:params) { { sort: order } }
+
+        it { is_expected.to eq([sort_repository2, sort_repository])}
+      end
+    end
+
+    [:created_asc, :updated_desc, :name_asc].each do |order|
+      context "with sort set to #{order}" do
+        let(:params) { { sort: order } }
+
+        it { is_expected.to eq([sort_repository, sort_repository2])}
+      end
+    end
+  end
+
   describe '#execute' do
     context 'with authorized user' do
       subject { described_class.new(user: reporter, subject: subject_object, params: params).execute }
@@ -47,6 +75,7 @@ RSpec.describe ContainerRepositoriesFinder do
         it { is_expected.to match_array([project_repository, other_repository]) }
 
         it_behaves_like 'with name search'
+        it_behaves_like 'with sorting'
       end
 
       context 'when subject_type is project' do
@@ -55,6 +84,7 @@ RSpec.describe ContainerRepositoriesFinder do
         it { is_expected.to match_array([project_repository]) }
 
         it_behaves_like 'with name search'
+        it_behaves_like 'with sorting'
       end
 
       context 'with invalid subject_type' do
diff --git a/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js b/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js
index b77dd6c057d..7790232236a 100644
--- a/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js
+++ b/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js
@@ -1,9 +1,8 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils';
-import { GlSprintf, GlLink } from '@gitlab/ui';
+import { GlSprintf, GlLink, GlAlert } from '@gitlab/ui';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
-import createFlash from '~/flash';
 import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue';
 import component from '~/packages_and_registries/settings/group/components/group_settings_app.vue';
 import MavenSettings from '~/packages_and_registries/settings/group/components/maven_settings.vue';
@@ -30,6 +29,7 @@ const localVue = createLocalVue();
 describe('Group Settings App', () => {
   let wrapper;
   let apolloProvider;
+  let show;
 
   const defaultProvide = {
     defaultExpanded: false,
@@ -40,6 +40,7 @@ describe('Group Settings App', () => {
     provide = defaultProvide,
     resolver = jest.fn().mockResolvedValue(groupPackageSettingsMock),
     mutationResolver = jest.fn().mockResolvedValue(groupPackageSettingsMutationMock()),
+    data = {},
   } = {}) => {
     localVue.use(VueApollo);
 
@@ -54,13 +55,27 @@ describe('Group Settings App', () => {
       localVue,
       apolloProvider,
       provide,
+      data() {
+        return {
+          ...data,
+        };
+      },
       stubs: {
         GlSprintf,
         SettingsBlock,
       },
+      mocks: {
+        $toast: {
+          show,
+        },
+      },
     });
   };
 
+  beforeEach(() => {
+    show = jest.fn();
+  });
+
   afterEach(() => {
     wrapper.destroy();
     wrapper = null;
@@ -70,6 +85,7 @@ describe('Group Settings App', () => {
   const findDescription = () => wrapper.find('[data-testid="description"');
   const findLink = () => wrapper.find(GlLink);
   const findMavenSettings = () => wrapper.find(MavenSettings);
+  const findAlert = () => wrapper.find(GlAlert);
 
   const waitForApolloQueryAndRender = async () => {
     await waitForPromises();
@@ -178,8 +194,7 @@ describe('Group Settings App', () => {
 
         await waitForPromises();
 
-        expect(createFlash).toHaveBeenCalledWith({
-          message: SUCCESS_UPDATING_SETTINGS,
+        expect(show).toHaveBeenCalledWith(SUCCESS_UPDATING_SETTINGS, {
           type: 'success',
         });
       });
@@ -211,6 +226,12 @@ describe('Group Settings App', () => {
     });
 
     describe('errors', () => {
+      const verifyAlert = () => {
+        expect(findAlert().exists()).toBe(true);
+        expect(findAlert().text()).toBe(ERROR_UPDATING_SETTINGS);
+        expect(findAlert().props('variant')).toBe('warning');
+      };
+
       it('mutation payload with root level errors', async () => {
         // note this is a complex test that covers all the path around errors that are shown in the form
         // it's one single it case, due to the expensive preparation and execution
@@ -229,10 +250,8 @@ describe('Group Settings App', () => {
         );
 
         // general error message is shown
-        expect(createFlash).toHaveBeenCalledWith({
-          message: ERROR_UPDATING_SETTINGS,
-          type: 'warning',
-        });
+
+        verifyAlert();
 
         emitSettingsUpdate();
 
@@ -242,11 +261,11 @@ describe('Group Settings App', () => {
         expect(findMavenSettings().props('mavenDuplicateExceptionRegexError')).toBe('');
       });
 
-      it('mutation payload with local errors', async () => {
-        const mutationResolver = jest
-          .fn()
-          .mockResolvedValue(groupPackageSettingsMutationMock({ errors: ['foo'] }));
-
+      it.each`
+        type         | mutationResolver
+        ${'local'}   | ${jest.fn().mockResolvedValue(groupPackageSettingsMutationMock({ errors: ['foo'] }))}
+        ${'network'} | ${jest.fn().mockRejectedValue()}
+      `('mutation payload with $type error', async ({ mutationResolver }) => {
         mountComponent({ mutationResolver });
 
         await waitForApolloQueryAndRender();
@@ -255,26 +274,35 @@ describe('Group Settings App', () => {
 
         await waitForPromises();
 
-        expect(createFlash).toHaveBeenCalledWith({
-          message: ERROR_UPDATING_SETTINGS,
-          type: 'warning',
-        });
+        verifyAlert();
       });
 
-      it('shows an error in case of network error', async () => {
-        const mutationResolver = jest.fn().mockRejectedValue();
-        mountComponent({ mutationResolver });
+      it('a successful request dismisses the alert', async () => {
+        mountComponent({ data: { alertMessage: 'foo' } });
 
         await waitForApolloQueryAndRender();
 
+        expect(findAlert().exists()).toBe(true);
+
         emitSettingsUpdate();
 
         await waitForPromises();
 
-        expect(createFlash).toHaveBeenCalledWith({
-          message: ERROR_UPDATING_SETTINGS,
-          type: 'warning',
-        });
+        expect(findAlert().exists()).toBe(false);
+      });
+
+      it('dismiss event from alert dismiss it from the page', async () => {
+        mountComponent({ data: { alertMessage: 'foo' } });
+
+        await waitForApolloQueryAndRender();
+
+        expect(findAlert().exists()).toBe(true);
+
+        findAlert().vm.$emit('dismiss');
+
+        await wrapper.vm.$nextTick();
+
+        expect(findAlert().exists()).toBe(false);
       });
     });
   });
diff --git a/spec/graphql/resolvers/container_repositories_resolver_spec.rb b/spec/graphql/resolvers/container_repositories_resolver_spec.rb
index b888d79626e..a17d2a7b0d5 100644
--- a/spec/graphql/resolvers/container_repositories_resolver_spec.rb
+++ b/spec/graphql/resolvers/container_repositories_resolver_spec.rb
@@ -27,6 +27,34 @@ RSpec.describe Resolvers::ContainerRepositoriesResolver do
 
         it { is_expected.to contain_exactly(named_container_repository) }
       end
+
+      context 'with a sort argument' do
+        let_it_be(:group) { create(:group) }
+        let_it_be(:project) { create(:project, group: group) }
+        let_it_be(:sort_repository) do
+          create(:container_repository, name: 'bar', project: project, created_at: 1.day.ago)
+        end
+
+        let_it_be(:sort_repository2) do
+          create(:container_repository, name: 'foo', project: project, created_at: 1.hour.ago, updated_at: 1.hour.ago)
+        end
+
+        [:created_desc, :updated_asc, :name_desc].each do |order|
+          context "#{order}" do
+            let(:args) { { sort: order } }
+
+            it { is_expected.to eq([sort_repository2, sort_repository]) }
+          end
+        end
+
+        [:created_asc, :updated_desc, :name_asc].each do |order|
+          context "#{order}" do
+            let(:args) { { sort: order } }
+
+            it { is_expected.to eq([sort_repository, sort_repository2]) }
+          end
+        end
+      end
     end
 
     context 'with authorized user' do
diff --git a/spec/graphql/types/container_repository_sort_enum_spec.rb b/spec/graphql/types/container_repository_sort_enum_spec.rb
new file mode 100644
index 00000000000..eb936c6d3a1
--- /dev/null
+++ b/spec/graphql/types/container_repository_sort_enum_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe GitlabSchema.types['ContainerRepositorySort'] do
+  specify { expect(described_class.graphql_name).to eq('ContainerRepositorySort') }
+
+  it_behaves_like 'common sort values'
+
+  it 'exposes all the existing issue sort values' do
+    expect(described_class.values.keys).to include(
+      *%w[NAME_ASC NAME_DESC]
+    )
+  end
+end
diff --git a/spec/models/pages/lookup_path_spec.rb b/spec/models/pages/lookup_path_spec.rb
index d95a33aabcc..0a2b04f1a7c 100644
--- a/spec/models/pages/lookup_path_spec.rb
+++ b/spec/models/pages/lookup_path_spec.rb
@@ -124,43 +124,34 @@ RSpec.describe Pages::LookupPath do
 
         include_examples 'uses disk storage'
       end
-    end
 
-    context 'when deployment were created during migration' do
-      before do
-        FileUtils.mkdir_p File.join(project.pages_path, "public")
-        File.open(File.join(project.pages_path, "public/index.html"), "w") do |f|
-          f.write("Hello!")
-        end
-
-        expect(::Pages::MigrateLegacyStorageToDeploymentService.new(project).execute[:status]).to eq(:success)
-
-        project.reload
-      end
-
-      let(:deployment) { project.pages_metadatum.pages_deployment }
-
-      it 'uses deployment from object storage' do
-        freeze_time do
-          expect(source).to(
-            eq({
-                 type: 'zip',
-                 path: deployment.file.url(expire_at: 1.day.from_now),
-                 global_id: "gid://gitlab/PagesDeployment/#{deployment.id}",
-                 sha256: deployment.file_sha256,
-                 file_size: deployment.size,
-                 file_count: deployment.file_count
-               })
-          )
-        end
-      end
-
-      context 'when pages_serve_from_migrated_zip feature flag is disabled' do
+      context 'when deployment were created during migration' do
         before do
-          stub_feature_flags(pages_serve_from_migrated_zip: false)
+          allow(deployment).to receive(:migrated?).and_return(true)
         end
 
-        include_examples 'uses disk storage'
+        it 'uses deployment from object storage' do
+          freeze_time do
+            expect(source).to(
+              eq({
+                   type: 'zip',
+                   path: deployment.file.url(expire_at: 1.day.from_now),
+                   global_id: "gid://gitlab/PagesDeployment/#{deployment.id}",
+                   sha256: deployment.file_sha256,
+                   file_size: deployment.size,
+                   file_count: deployment.file_count
+                 })
+            )
+          end
+        end
+
+        context 'when pages_serve_from_migrated_zip feature flag is disabled' do
+          before do
+            stub_feature_flags(pages_serve_from_migrated_zip: false)
+          end
+
+          include_examples 'uses disk storage'
+        end
       end
     end
   end
diff --git a/spec/models/pages_deployment_spec.rb b/spec/models/pages_deployment_spec.rb
index e83cbc15004..029eb8e513a 100644
--- a/spec/models/pages_deployment_spec.rb
+++ b/spec/models/pages_deployment_spec.rb
@@ -26,6 +26,46 @@ RSpec.describe PagesDeployment do
     end
   end
 
+  describe '.migrated_from_legacy_storage' do
+    it 'only returns migrated deployments' do
+      project = create(:project)
+      migrated_deployment = create_migrated_deployment(project)
+      # create one other deployment
+      create(:pages_deployment, project: project)
+
+      expect(described_class.migrated_from_legacy_storage).to eq([migrated_deployment])
+    end
+  end
+
+  describe '#migrated?' do
+    it 'returns false for normal deployment' do
+      deployment = create(:pages_deployment)
+
+      expect(deployment.migrated?).to eq(false)
+    end
+
+    it 'returns true for migrated deployment' do
+      project = create(:project)
+      deployment = create_migrated_deployment(project)
+
+      expect(deployment.migrated?).to eq(true)
+    end
+  end
+
+  def create_migrated_deployment(project)
+    public_path = File.join(project.pages_path, "public")
+    FileUtils.mkdir_p(public_path)
+    File.open(File.join(project.pages_path, "public/index.html"), "w") do |f|
+      f.write("Hello!")
+    end
+
+    expect(::Pages::MigrateLegacyStorageToDeploymentService.new(project).execute[:status]).to eq(:success)
+
+    project.reload.pages_metadatum.pages_deployment
+  ensure
+    FileUtils.rm_rf(public_path)
+  end
+
   describe 'default for file_store' do
     let(:project) { create(:project) }
     let(:deployment) do
diff --git a/spec/requests/api/graphql/project/container_repositories_spec.rb b/spec/requests/api/graphql/project/container_repositories_spec.rb
index 6b1c8689515..2087d8c2cc3 100644
--- a/spec/requests/api/graphql/project/container_repositories_spec.rb
+++ b/spec/requests/api/graphql/project/container_repositories_spec.rb
@@ -156,4 +156,51 @@ RSpec.describe 'getting container repositories in a project' do
 
     expect(container_repositories_count_response).to eq(container_repositories.size)
   end
+
+  describe 'sorting and pagination' do
+    let_it_be(:data_path) { [:project, :container_repositories] }
+    let_it_be(:sort_project) { create(:project, :public) }
+    let_it_be(:current_user) { create(:user) }
+    let_it_be(:container_repository1) { create(:container_repository, name: 'b', project: sort_project) }
+    let_it_be(:container_repository2) { create(:container_repository, name: 'a', project: sort_project) }
+    let_it_be(:container_repository3) { create(:container_repository, name: 'd', project: sort_project) }
+    let_it_be(:container_repository4) { create(:container_repository, name: 'c', project: sort_project) }
+    let_it_be(:container_repository5) { create(:container_repository, name: 'e', project: sort_project) }
+
+    before do
+      stub_container_registry_tags(repository: container_repository1.path, tags: %w(tag1 tag1 tag3), with_manifest: false)
+      stub_container_registry_tags(repository: container_repository2.path, tags: %w(tag4 tag5 tag6), with_manifest: false)
+      stub_container_registry_tags(repository: container_repository3.path, tags: %w(tag7 tag8), with_manifest: false)
+      stub_container_registry_tags(repository: container_repository4.path, tags: %w(tag9), with_manifest: false)
+      stub_container_registry_tags(repository: container_repository5.path, tags: %w(tag10 tag11), with_manifest: false)
+    end
+
+    def pagination_query(params)
+      graphql_query_for(:project, { full_path: sort_project.full_path },
+        query_nodes(:container_repositories, :name, include_pagination_info: true, args: params)
+      )
+    end
+
+    def pagination_results_data(data)
+      data.map { |container_repository| container_repository.dig('name') }
+    end
+
+    context 'when sorting by name' do
+      context 'when ascending' do
+        it_behaves_like 'sorted paginated query' do
+          let(:sort_param) { :NAME_ASC }
+          let(:first_param) { 2 }
+          let(:expected_results) { [container_repository2.name, container_repository1.name, container_repository4.name, container_repository3.name, container_repository5.name] }
+        end
+      end
+
+      context 'when descending' do
+        it_behaves_like 'sorted paginated query' do
+          let(:sort_param) { :NAME_DESC }
+          let(:first_param) { 2 }
+          let(:expected_results) { [container_repository5.name, container_repository3.name, container_repository4.name, container_repository1.name, container_repository2.name] }
+        end
+      end
+    end
+  end
 end
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb
index e4848bf7c16..88770c8095b 100644
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -474,6 +474,22 @@ module Ci
           end
 
           it_behaves_like 'validation is active'
+
+          context 'when the main feature flag is enabled for a specific project' do
+            before do
+              stub_feature_flags(ci_validate_build_dependencies: pipeline.project)
+            end
+
+            it_behaves_like 'validation is active'
+          end
+
+          context 'when the main feature flag is enabled for a different project' do
+            before do
+              stub_feature_flags(ci_validate_build_dependencies: create(:project))
+            end
+
+            it_behaves_like 'validation is not active'
+          end
         end
 
         context 'when validates for dependencies is disabled' do
diff --git a/spec/support/migrations_helpers/vulnerabilities_findings_helper.rb b/spec/support/migrations_helpers/vulnerabilities_findings_helper.rb
new file mode 100644
index 00000000000..922f49ba84a
--- /dev/null
+++ b/spec/support/migrations_helpers/vulnerabilities_findings_helper.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+module MigrationHelpers
+  module VulnerabilitiesFindingsHelper
+    def attributes_for_vulnerabilities_finding
+      uuid = SecureRandom.uuid
+
+      {
+        project_fingerprint: SecureRandom.hex(20),
+        location_fingerprint: Digest::SHA1.hexdigest(SecureRandom.hex(10)),
+        uuid: uuid,
+        name: "Vulnerability Finding #{uuid}",
+        metadata_version: '1.3',
+        raw_metadata: raw_metadata
+      }
+    end
+
+    def raw_metadata
+      {
+        "description" => "The cipher does not provide data integrity update 1",
+        "message" => "The cipher does not provide data integrity",
+        "cve" => "818bf5dacb291e15d9e6dc3c5ac32178:CIPHER",
+        "solution" => "GCM mode introduces an HMAC into the resulting encrypted data, providing integrity of the result.",
+        "location" => {
+          "file" => "maven/src/main/java/com/gitlab/security_products/tests/App.java",
+          "start_line" => 29,
+          "end_line" => 29,
+          "class" => "com.gitlab.security_products.tests.App",
+          "method" => "insecureCypher"
+        },
+        "links" => [
+          {
+            "name" => "Cipher does not check for integrity first?",
+             "url" => "https://crypto.stackexchange.com/questions/31428/pbewithmd5anddes-cipher-does-not-check-for-integrity-first"
+          }
+        ],
+        "assets" => [
+          {
+            "type" => "postman",
+            "name" => "Test Postman Collection",
+             "url" => "http://localhost/test.collection"
+          }
+        ],
+        "evidence" => {
+          "summary" => "Credit card detected",
+          "request" => {
+            "method" => "GET",
+            "url" => "http://goat:8080/WebGoat/logout",
+            "body" => nil,
+            "headers" => [
+              {
+                 "name" => "Accept",
+                "value" => "*/*"
+              }
+            ]
+          },
+          "response" => {
+            "reason_phrase" => "OK",
+            "status_code" => 200,
+            "body" => nil,
+            "headers" => [
+              {
+                 "name" => "Content-Length",
+                "value" => "0"
+              }
+            ]
+          },
+          "source" => {
+            "id" => "assert:Response Body Analysis",
+            "name" => "Response Body Analysis",
+            "url" => "htpp://hostname/documentation"
+          },
+          "supporting_messages" => [
+            {
+              "name" => "Origional",
+              "request" => {
+                "method" => "GET",
+                "url" => "http://goat:8080/WebGoat/logout",
+                "body" => "",
+                "headers" => [
+                  {
+                    "name" => "Accept",
+                    "value" => "*/*"
+                  }
+                ]
+              }
+            },
+            {
+              "name" => "Recorded",
+              "request" => {
+                "method" => "GET",
+                "url" => "http://goat:8080/WebGoat/logout",
+                "body" => "",
+                "headers" => [
+                    {
+                      "name" => "Accept",
+                      "value" => "*/*"
+                    }
+                ]
+              },
+              "response" => {
+                "reason_phrase" => "OK",
+                "status_code" => 200,
+                "body" => "",
+                "headers" => [
+                  {
+                    "name" => "Content-Length",
+                    "value" => "0"
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      }
+    end
+  end
+end