From 11093f54ccda3ad6851b82642bc2206ac533be21 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 16 Oct 2023 06:10:09 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 GITLAB_KAS_VERSION                            |   2 +-
 .../components/deployment/deployment.vue      |   2 +-
 .../slack_slash_commands/_help.html.haml      |  10 +-
 db/schema_migrations/20231011232010           |   2 +-
 doc/development/project_templates/index.md    | 175 ++++++++++++++++++
 qa/README.md                                  |   4 +-
 6 files changed, 185 insertions(+), 10 deletions(-)
 create mode 100644 doc/development/project_templates/index.md

diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION
index ff5016c8054..97dcb79e026 100644
--- a/GITLAB_KAS_VERSION
+++ b/GITLAB_KAS_VERSION
@@ -1 +1 @@
-v16.5.0-rc2
+v16.5.0
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue
index 8290e7e9232..1829b674455 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue
@@ -37,7 +37,7 @@ export default {
 </script>
 
 <template>
-  <div class="deploy-heading gl-px-5">
+  <div class="deploy-heading gl-pl-5 gl-pr-4">
     <div class="ci-widget media">
       <div class="media-body">
         <div class="deploy-body">
diff --git a/app/views/shared/integrations/slack_slash_commands/_help.html.haml b/app/views/shared/integrations/slack_slash_commands/_help.html.haml
index defaf50efea..f8eb60cb340 100644
--- a/app/views/shared/integrations/slack_slash_commands/_help.html.haml
+++ b/app/views/shared/integrations/slack_slash_commands/_help.html.haml
@@ -40,7 +40,7 @@
           .col-12.input-group
             = text_field_tag :url, service_trigger_url(integration), class: 'form-control form-control-sm', readonly: 'readonly'
             .input-group-append
-              = deprecated_clipboard_button(target: '#url', class: 'input-group-text')
+              = clipboard_button(target: '#url', category: :primary, size: :medium)
 
         .form-group
           = label_tag nil, _('Method'), class: 'col-12 col-form-label label-bold'
@@ -51,7 +51,7 @@
           .col-12.input-group
             = text_field_tag :customize_name, 'GitLab', class: 'form-control form-control-sm', readonly: 'readonly'
             .input-group-append
-              = deprecated_clipboard_button(target: '#customize_name', class: 'input-group-text')
+              = clipboard_button(target: '#customize_name', category: :primary, size: :medium)
 
         .form-group
           = label_tag nil, _('Customize icon'), class: 'col-12 col-form-label label-bold'
@@ -68,21 +68,21 @@
           .col-12.input-group
             = text_field_tag :autocomplete_description, run_actions_text.html_safe, class: 'form-control form-control-sm', readonly: 'readonly'
             .input-group-append
-              = deprecated_clipboard_button(target: '#autocomplete_description', class: 'input-group-text')
+              = clipboard_button(target: '#autocomplete_description', category: :primary, size: :medium)
 
         .form-group
           = label_tag :autocomplete_usage_hint, _('Autocomplete usage hint'), class: 'col-12 col-form-label label-bold'
           .col-12.input-group
             = text_field_tag :autocomplete_usage_hint, '[help]', class: 'form-control form-control-sm', readonly: 'readonly'
             .input-group-append
-              = deprecated_clipboard_button(target: '#autocomplete_usage_hint', class: 'input-group-text')
+              = clipboard_button(target: '#autocomplete_usage_hint', category: :primary, size: :medium)
 
         .form-group
           = label_tag :descriptive_label, _('Descriptive label'), class: 'col-12 col-form-label label-bold'
           .col-12.input-group
             = text_field_tag :descriptive_label, _('Perform common operations on GitLab project'), class: 'form-control form-control-sm', readonly: 'readonly'
             .input-group-append
-              = deprecated_clipboard_button(target: '#descriptive_label', class: 'input-group-text')
+              = clipboard_button(target: '#descriptive_label', category: :primary, size: :medium)
 
       %hr
 
diff --git a/db/schema_migrations/20231011232010 b/db/schema_migrations/20231011232010
index 1bd0fcdc4c0..c960631e672 100644
--- a/db/schema_migrations/20231011232010
+++ b/db/schema_migrations/20231011232010
@@ -1 +1 @@
-9165e6f69ae887e1937644a96105cdf369feff91bfb295694510478b4622be7d
\ No newline at end of file
+6a4a1e3c427fa7e525c8f6550eb26c66a323a9cda9ea5aab1b5984b292d4a172
\ No newline at end of file
diff --git a/doc/development/project_templates/index.md b/doc/development/project_templates/index.md
new file mode 100644
index 00000000000..b6ecf3b3f00
--- /dev/null
+++ b/doc/development/project_templates/index.md
@@ -0,0 +1,175 @@
+---
+stage: Create
+group: Source Code
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Custom group-level project templates development guidelines
+
+This document was created to help contributors understand the code design of
+[custom group-level project templates](../../user/group/custom_project_templates.md).
+You should read this document before making changes to the code for this feature.
+
+This document is intentionally limited to an overview of how the code is
+designed, as code can change often. To understand how a specific part of the
+feature works, view the code and the specs. The details here explain how the
+major components of the templating feature work.
+
+NOTE:
+This document should be updated when parts of the codebase referenced in this
+document are updated, removed, or new parts are added.
+
+## Basic overview
+
+A custom group-level project template is a regular project that is exported and
+then imported into the newly created project.
+
+Given we have `Group1` which contains template subgroup named `Subgroup1`.
+Inside Subgroup1 we have a project called `Template1`.
+`User1` creates `Project1` inside `Group1` using `Template1`, the logic follows these
+steps:
+
+1. Initialize `Project1`
+1. Export `Template1`
+1. Import into `Project1`
+
+## Business logic
+
+- `ProjectsController#create`: the controller where the flow begins
+  - Defined in `app/controllers/projects_controller.rb`.
+- `Projects::CreateService`: handles the creation of the project.
+  - Defined in `app/services/projects/create_service.rb`.
+- `EE::Projects::CreateService`: EE extension for create service
+  - Defined in `ee/app/services/ee/projects/create_service.rb`.
+- `Projects::CreateFromTemplateService`: handles creating a project from a custom project template.
+  - Defined in `app/services/projects/create_from_template_service.rb`
+- `EE:Projects::CreateFromTemplateService`: EE extension for create from template service.
+  - Defined in `ee/app/services/ee/projects/create_from_template_service.rb`.
+- `Projects::GitlabProjectsImportService`: Handles importing the template.
+  - Defined in `app/services/projects/gitlab_projects_import_service.rb`.
+- `EE::Projects::GitlabProjectsImportService`: EE extension to import service.
+  - Defined in `ee/app/services/ee/projects/gitlab_projects_import_service.rb`.
+- `ProjectTemplateExportWorker`: Handles exporting the custom template.
+  - Defined in `ee/app/workers/project_template_export_worker.rb`.
+- `ProjectExportWorker`: Base class for ProjectTemplateExportWorker.
+  - Defined in `app/workers/project_export_worker.rb`.
+- `Projects::ImportExport::ExportService`: Service to export project.
+  - Defined in `app/workers/project_export_worker.rb`.
+- `Gitlab::ImportExport::VersionSaver`: Handles exporting the versions.
+  - Defined in `lib/gitlab/import_export/version_saver.rb`.
+- `Gitlab::ImportExport::UploadsManager`: Handles exporting uploaded files.
+  - Defined in `lib/gitlab/import_export/uploads_manager.rb`.
+- `Gitlab::ImportExport::AvatarSaver`: Exports the avatars.
+  - Defined in `lib/gitlab/import_export/avatar_saver.rb`.
+- `Gitlab::ImportExport::Project::TreeSaver`: Exports the project and related objects.
+  - Defined in `lib/gitlab/import_export/project/tree_saver.rb`.
+- `EE:Gitlab::ImportExport::Project::TreeSaver`: Exports the project and related objects.
+  - Defined in `lib/gitlab/import_export/project/tree_saver.rb`.
+- `Gitlab::ImportExport::Json::StreamingSerializer`: Serializes the exported objects to JSON.
+  - Defined in `lib/gitlab/import_export/json/streaming_serializer.rb`.
+- `Gitlab::ImportExport::Reader`: Wrapper around exported JSON files.
+  - Defined in `lib/gitlab/import_export/reader.rb`.
+- `Gitlab::ImportExport::AttributesFinder`: Parses configuration and finds attributes in exported JSON files.
+  - Defined in `lib/gitlab/import_export/attributes_finder.rb`.
+- `Gitlab::ImportExport::Config`: Wrapper around import/export YAML configuration file.
+  - Defined in `lib/gitlab/import_export/config.rb`.
+- `Gitlab::ImportExport`: Entry point with convenience methods.
+  - Defined in `lib/gitlab/import_export.rb`.
+- `Gitlab::ImportExport::UploadsSaver`: Exports uploaded files.
+  - Defined in `lib/gitlab/import_export/uploads_saver.rb`.
+- `Gitlab::ImportExport::RepoSaver`: Exports the repository.
+  - Defined in `lib/gitlab/import_export/repo_saver.rb`.
+- `Gitlab::ImportExport::WikiRepoSaver`: Exports the wiki repository.
+  - Defined in `lib/gitlab/import_export/wiki_repo_saver.rb`.
+- `EE:Gitlab::ImportExport::WikiRepoSaver`: Extends wiki repository saver.
+  - Defined in `ee/lib/ee/gitlab/import_export/wiki_repo_saver.rb`.
+- `Gitlab::ImportExport::LfsSaver`: Export LFS objects and files.
+  - Defined in `lib/gitlab/import_export/lfs_saver.rb`.
+- `Gitlab::ImportExport::SnippetsRepoSaver`: Exports snippets repository
+  - Defined in `lib/gitlab/import_export/snippet_repo_saver.rb`.
+- `Gitlab::ImportExport::DesignRepoSaver`: Exports design repository
+  - Defined in `lib/gitlab/import_export/design_repo_saver.rb`.
+- `Gitlab::ImportExport::Error`: Custom error object.
+  - Defined in `lib/gitlab/import_export/error.rb`.
+- `Gitlab::ImportExport::AfterExportStrategyBuilder`: Acts as callback to run after export is completed.
+  - Defined in `lib/gitlab/import_export/after_export_strategy_builder.rb`.
+- `Gitlab::Export::Logger`: Logger used during export.
+  - Defined in `lib/gitlab/export/logger.rb`.
+- `Gitlab::ImportExport::LogUtil`: Builds log messages.
+  - Defined in `lib/gitlab/import_export/log_util.rb`.
+- `Gitlab::ImportExport::AfterExportStrategies::CustomTemplateExportImportStrategy`: Callback class to import the template after it has been exported.
+  - Defined in `ee/lib/ee/gitlab/import_export/after_export_strategies/custom_template_export_import_strategy.rb`.
+- `Gitlab::TemplateHelper`: Helpers for importing templates.
+  - Defined in `lib/gitlab/template_helper.rb`.
+- `ImportExportUpload`: Stores the import and export archive files.
+  - Defined in `app/models/import_export_upload.rb`.
+- `Gitlab::ImportExport::AfterExportStrategies::BaseAfterExportStrategy`: Base after export strategy.
+  - Defined in `lib/gitlab/import_export/after_export_strategies/base_after_export_strategy.rb`.
+- `RepositoryImportWorker`: Worker to trigger the import step.
+  - Defined in `app/workers/repository_import_worker.rb`.
+- `EE::RepositoryImportWorker`: Extension to repository import worker.
+  - Defined in `ee/app/workers/ee/repository_import_worker.rb`.
+- `Projects::ImportService`: Executes the import step.
+  - Defined in `app/services/projects/import_service.rb`.
+- `EE:Projects::ImportService`: Extends import service.
+  - Defined in `ee/app/services/ee/projects/import_service.rb`.
+- `Projects::LfsPointers::LfsImportService`: Imports the LFS objects.
+  - Defined in `app/services/projects/lfs_pointers/lfs_import_service.rb`.
+- `Projects::LfsPointers::LfsObjectDownloadListService`: Main service to request links to download LFS objects.
+  - Defined in `app/services/projects/lfs_pointers/lfs_object_download_list_service.rb`.
+- `Projects::LfsPointers::LfsDownloadLinkListService`: Handles requesting links in batches and building list.
+  - Defined in `app/services/projects/lfs_pointers/lfs_download_link_list_service.rb`.
+- `Projects::LfsPointers::LfsListService`: Retrieves LFS blob pointers.
+  - Defined in `app/services/projects/lfs_pointers/lfs_list_service.rb`.
+- `Projects::LfsPointers::LfsDownloadService`: Downloads and links LFS objects.
+  - Defined in `app/services/projects/lfs_pointers/lfs_download_service.rb`.
+- `Gitlab::ImportSources`: Module to configure which importer to use.
+  - Defined in `lib/gitlab/import_sources.rb`.
+- `EE::Gitlab::ImportSources`: Extends import sources.
+  - Defined in `ee/lib/ee/gitlab/import_sources.rb`.
+- `Gitlab::ImportExport::Importer`: Importer class.
+  - Defined in `lib/gitlab/import_export/importer.rb`.
+- `EE::Gitlab::ImportExport::Importer`: Extends importer.
+  - Defined in `ee/lib/ee/gitlab/import_export/importer.rb`.
+- `Gitlab::ImportExport::FileImporter`: Imports archive files.
+  - Defined in `lib/gitlab/import_export/file_importer.rb`.
+- `Gitlab::ImportExport::DecompressedArchiveSizeValidator`: Validates archive file size.
+  - Defined in `lib/gitlab/import_export/decompressed_archive_size_validator.rb`.
+- `Gitlab::ImportExport::VersionChecker`: Verifies version of export matches importer.
+  - Defined in `lib/gitlab/import_export/version_checker.rb`.
+- `Gitlab::ImportExport::Project::TreeRestorer`: Handles importing project and associated objects.
+  - Defined in `lib/gitlab/import_export/project/tree_restorer.rb`.
+- `Gitlab::ImportExport::Json::NdjsonReader`: Reader for JSON export files.
+  - Defined in `lib/gitlab/import_export/json/ndjson_reader.rb`.
+- `Gitlab::ImportExport::AvatarRestorer`: Handles importing avatar files.
+  - Defined in `lib/gitlab/import_export/avatar_restorer.rb`.
+- `Gitlab::ImportExport::RepoRestorer`: Handles importing repositories.
+  - Defined in `lib/gitlab/import_export/repo_restorer.rb`.
+- `EE:Gitlab::ImportExport::RepoRestorer`: Extends repository restorer.
+  - Defined in `ee/lib/ee/gitlab/import_export/repo_restorer.rb`.
+- `Gitlab::ImportExport::DesignRepoRestorer`: Handles restoring design repository.
+  - Defined in `lib/gitlab/import_export/design_repo_restorer.rb`.
+- `Gitlab::ImportExport::UploadsRestorer`: Handles restoring uploaded files.
+  - Defined in `lib/gitlab/import_export/uploads_restorer.rb`.
+- `Gitlab::ImportExport::LfsRestorer`: Restores LFS objects.
+  - Defined in `lib/gitlab/import_export/lfs_restorer.rb`.
+- `Gitlab::ImportExport::SnippetsRepoRestorer`: Handles restoring snippets repository.
+  - Defined in `lib/gitlab/import_export/snippets_repo_restorer.rb`.
+- `Gitlab::ImportExport::SnippetRepoRestorer`: Handles restoring individual snippets.
+  - Defined in `lib/gitlab/import_export/snippet_repo_restorer.rb`.
+- `Snippets::RepositoryValidationService`: Validates snippets repository archive.
+  - Defined in `app/services/snippets/repository_validation_service.rb`.
+- `Snippets::UpdateStatisticsService`: Updates statistics for the snippets repository.
+  - Defined in `app/services/snippets/update_statistics_service.rb`.
+- `Gitlab::BackgroundMigration::BackfillSnippetRepositories`: Backfills missing snippets in hashed storage.
+  - Defined in `lib/gitlab/background_migration/backfill_snippet_repositories.rb`.
+- `Gitlab::ImportExport::StatisticsRestorer`: Refreshes project statistics.
+  - Defined in `lib/gitlab/import_export/importer.rb`.
+- `Gitlab::ImportExport::Project::CustomTemplateRestorer`: Handles additional imports for custom templates.
+  - Defined in `ee/lib/gitlab/import_export/project/custom_template_restorer.rb`.
+- `Gitlab::ImportExport::Project::ProjectHooksRestorer`: Handles importing project hooks.
+  - Defined in `ee/lib/gitlab/import_export/project/project_hooks_restorer.rb`.
+- `Gitlab::ImportExport::Project::DeployKeysRestorer`: Handles importing deploy keys.
+  - Defined in `ee/lib/gitlab/import_export/project/deploy_keys_restorer.rb`.
+- `Gitlab::ImportExport::Project::CustomTemplateRestorerHelper`: Helpers for custom templates restorer.
+  - Defined in `ee/lib/gitlab/import_export/project/custom_template_restorer_helper.rb`.
diff --git a/qa/README.md b/qa/README.md
index 15af644a4ae..ee9f1128f70 100644
--- a/qa/README.md
+++ b/qa/README.md
@@ -106,7 +106,7 @@ bundle exec rspec <path/to/spec.rb>
 Note:
 - If you want to run tests requiring SSH against GDK, you will need to [modify your GDK setup](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/docs/run_qa_against_gdk.md).
 - If this is your first time running GDK, you can use the password pre-set for `root`. [See supported GitLab environment variables](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/docs/what_tests_can_be_run.md#supported-gitlab-environment-variables). If you have changed your `root` password, export the password as `GITLAB_INITIAL_ROOT_PASSWORD`.
-- By default the tests will run in a headless browser. If you'd like to watch the test exectution, you can export `WEBDRIVER_HEADLESS=false`.
+- By default the tests will run in a headless browser. If you'd like to watch the test execution, you can export `WEBDRIVER_HEADLESS=false`.
 - Tests that are tagged `:orchestrated` require special setup (e.g., custom GitLab configuration, or additional services such as LDAP). All [orchestrated tests can be run via `gitlab-qa`](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/docs/what_tests_can_be_run.md). There are also [setup instructions](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/running_tests_that_require_special_setup.html) for running some of those tests against GDK or another local GitLab instance.
 
 #### Generic command for a typical GDK installation
@@ -199,7 +199,7 @@ When running EE tests you'll need to have a license available. GitLab engineers
 Once you have the license file you can export it as an environment variable and then the framework can use it. If you do so it will be installed automatically.
 
 ```shell
-export EE_LICENSE=$(cat /path/to/gitlab_license)
+export QA_EE_LICENSE=$(cat /path/to/gitlab_license)
 ```
 
 #### Running specific tests