Add latest changes from gitlab-org/gitlab@master

5 files changed, 115 insertions, 12 deletions

diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md
index f570c9b559f..792afc6c3d7 100644
--- a/doc/administration/integration/terminal.md
+++ b/doc/administration/integration/terminal.md
@@ -11,6 +11,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 WARNING:
 This feature was [deprecated](https://gitlab.com/groups/gitlab-org/configure/-/epics/8) in GitLab 14.5.
 
+- Read more about the non-deprecated [Web Terminals accessible through the Web IDE](../../user/project/web_ide/index.md).
+- Read more about the non-deprecated [Web Terminals accessible from a running CI job](../../ci/interactive_web_terminal/index.md).
+
+---
+
 With the introduction of the [Kubernetes integration](../../user/infrastructure/clusters/index.md),
 GitLab can store and use credentials for a Kubernetes cluster.
 GitLab uses these credentials to provide access to
diff --git a/doc/development/database/loose_foreign_keys.md b/doc/development/database/loose_foreign_keys.md
index 9a44198d908..4dd187cba8b 100644
--- a/doc/development/database/loose_foreign_keys.md
+++ b/doc/development/database/loose_foreign_keys.md
@@ -50,6 +50,107 @@ we can:
 NOTE:
 For this procedure to work, we must register which tables to clean up asynchronously.
 
+## The `scripts/decomposition/generate-loose-foreign-key`
+
+We built an automation tool to aid migration of foreign keys into loose foreign keys as part of
+decomposition effort. It presents existing keys and allows chosen foreign keys to be automatically
+converted into loose foreign keys. This ensures consistency between foreign key and loose foreign
+key definitions, and ensures that they are properly tested.
+
+WARNING:
+We strongly advise you to use the automation script for swapping any foreign key to a loose foreign key.
+
+The tool ensures that all aspects of swapping a foreign key are covered. This includes:
+
+- Creating a migration to remove a foreign key.
+- Updating `db/structure.sql` with the new migration.
+- Updating `lib/gitlab/database/gitlab_loose_foreign_keys.yml` to add the new loose foreign key.
+- Creating or updating a model's specs to ensure that the loose foreign key is properly supported.
+- Creating a new branch, commit, push, and creating a merge request on GitLab.com.
+- Creating a merge request template with all the necessary details to validate the safety of the foreign key removal.
+
+The tool is located at `scripts/decomposition/generate-loose-foreign-key`:
+
+```shell
+$ scripts/decomposition/generate-loose-foreign-key -h
+
+Usage: scripts/decomposition/generate-loose-foreign-key [options] <filters...>
+    -c, --cross-schema               Show only cross-schema foreign keys
+    -n, --dry-run                    Do not execute any commands (dry run)
+    -b, --[no-]branch                Create or not a new branch
+    -r, --[no-]rspec                 Create or not a rspecs automatically
+    -m, --milestone MILESTONE        Specify custom milestone (current: 14.8)
+    -h, --help                       Prints this help
+```
+
+For the migration of cross-schema foreign keys, we use the `-c` modifier to show the foreign keys
+yet to migrate:
+
+```shell
+$ scripts/decomposition/generate-loose-foreign-key -c
+Re-creating current test database
+Dropped database 'gitlabhq_test_ee'
+Dropped database 'gitlabhq_geo_test_ee'
+Created database 'gitlabhq_test_ee'
+Created database 'gitlabhq_geo_test_ee'
+
+Showing cross-schema foreign keys (20):
+   ID | HAS_LFK |                                     FROM |                   TO |                         COLUMN |       ON_DELETE 
+    0 |       N |                                ci_builds |             projects |                     project_id |         cascade 
+    1 |       N |                         ci_job_artifacts |             projects |                     project_id |         cascade 
+    2 |       N |                             ci_pipelines |             projects |                     project_id |         cascade 
+    3 |       Y |                             ci_pipelines |       merge_requests |               merge_request_id |         cascade 
+    4 |       N |                   external_pull_requests |             projects |                     project_id |         cascade 
+    5 |       N |                     ci_sources_pipelines |             projects |                     project_id |         cascade 
+    6 |       N |                                ci_stages |             projects |                     project_id |         cascade 
+    7 |       N |                    ci_pipeline_schedules |             projects |                     project_id |         cascade 
+    8 |       N |                       ci_runner_projects |             projects |                     project_id |         cascade 
+    9 |       Y |             dast_site_profiles_pipelines |         ci_pipelines |                 ci_pipeline_id |         cascade 
+   10 |       Y |                   vulnerability_feedback |         ci_pipelines |                    pipeline_id |         nullify 
+   11 |       N |                             ci_variables |             projects |                     project_id |         cascade 
+   12 |       N |                                  ci_refs |             projects |                     project_id |         cascade 
+   13 |       N |                       ci_builds_metadata |             projects |                     project_id |         cascade 
+   14 |       N |                ci_subscriptions_projects |             projects |          downstream_project_id |         cascade 
+   15 |       N |                ci_subscriptions_projects |             projects |            upstream_project_id |         cascade 
+   16 |       N |                      ci_sources_projects |             projects |              source_project_id |         cascade 
+   17 |       N |         ci_job_token_project_scope_links |             projects |              source_project_id |         cascade 
+   18 |       N |         ci_job_token_project_scope_links |             projects |              target_project_id |         cascade 
+   19 |       N |                ci_project_monthly_usages |             projects |                     project_id |         cascade 
+
+To match FK write one or many filters to match against FROM/TO/COLUMN:
+- scripts/decomposition/generate-loose-foreign-key <filter(s)...>
+- scripts/decomposition/generate-loose-foreign-key ci_job_artifacts project_id
+- scripts/decomposition/generate-loose-foreign-key dast_site_profiles_pipelines
+```
+
+The command accepts a list of filters to match from, to, or column for the purpose of the foreign key generation.
+For example, run this to swap all foreign keys for `ci_job_token_project_scope_links` for the
+decomposed database:
+
+```shell
+scripts/decomposition/generate-loose-foreign-key -c ci_job_token_project_scope_links
+```
+
+To swap only the `source_project_id` of `ci_job_token_project_scope_links` for the decomposed database, run:
+
+```shell
+scripts/decomposition/generate-loose-foreign-key -c ci_job_token_project_scope_links source_project_id
+```
+
+To swap all the foreign keys (all having `_id` appended), but not create a new branch (only commit
+the changes) and not create rspecs, run:
+
+```shell
+scripts/decomposition/generate-loose-foreign-key -c --no-branch --no-rspec _id
+```
+
+To swap all foreign keys referencing `projects`, but not create a new branch (only commit the
+changes), run:
+
+```shell
+scripts/decomposition/generate-loose-foreign-key -c --no-branch projects
+```
+
 ## Example migration and configuration
 
 ### Configure the loose foreign key
diff --git a/doc/user/clusters/management_project_template.md b/doc/user/clusters/management_project_template.md
index 9338d9b8603..ab17e462c6a 100644
--- a/doc/user/clusters/management_project_template.md
+++ b/doc/user/clusters/management_project_template.md
@@ -4,7 +4,7 @@ group: Configure
 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
 ---
 
-# Sample GitLab CI/CD project for Kubernetes **(FREE)**
+# Manage cluster applications **(FREE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25318) in GitLab 12.10 with Helmfile support via Helm v2.
 > - Helm v2 support was [dropped](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63577) in GitLab 14.0. Use Helm v3 instead.
diff --git a/doc/user/group/value_stream_analytics/index.md b/doc/user/group/value_stream_analytics/index.md
index 6942b9da393..f0ee9a8da56 100644
--- a/doc/user/group/value_stream_analytics/index.md
+++ b/doc/user/group/value_stream_analytics/index.md
@@ -276,9 +276,6 @@ To create a value stream:
 > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55572) in GitLab 13.10.
 > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/294190) in GitLab 13.11.
 
-WARNING:
-This feature might not be available to you. Check the **version history** note above for details.
-
 You can create value streams with stages, starting with a default or a blank template. You can
 add stages as desired.
 
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index bb6ee720d74..4b0aecbad68 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -358,25 +358,25 @@ Rather than attempting to push all changes at once, this workaround:
 ### Manually execute export steps
 
 Exports sometimes fail without giving enough information to troubleshoot. In these cases, it can be
-helpful to [execute the export process manually within rails](https://gitlab.com/gitlab-com/runbooks/-/blob/master/docs/uncategorized/project-export.md#export-a-project-via-rails-console).
+helpful to [open a rails console session](../../../administration/operations/rails_console.md#starting-a-rails-console-session)
+and loop through [all the defined exporters](https://gitlab.com/gitlab-org/gitlab/-/blob/b67a5b5a12498d57cd877023b7385f7251e57de8/app/services/projects/import_export/export_service.rb#L65).
 Execute each line individually, rather than pasting the entire block at once, so you can see any
 errors each command returns.
 
 ```shell
+# User needs to have permission to export
 u = User.find_by_username('someuser')
 p = Project.find_by_full_path('some/project')
 e = Projects::ImportExport::ExportService.new(p,u)
 
 e.send(:version_saver).send(:save)
-e.send(:avatar_saver).send(:save)
-e.send(:project_tree_saver).send(:save)
-e.send(:uploads_saver).send(:save)
-e.send(:wiki_repo_saver).send(:save)
-e.send(:lfs_saver).send(:save)
-e.send(:snippets_repo_saver).send(:save)
-e.send(:design_repo_saver).send(:save)
+e.send(:repo_saver).send(:save)
+## continue using `e.send(:exporter_name).send(:save)` going through the list of exporters
 
+# The following line should show you the export_path similar to /var/opt/gitlab/gitlab-rails/shared/tmp/gitlab_exports/@hashed/49/94/4994....
 s = Gitlab::ImportExport::Saver.new(exportable: p, shared:p.import_export_shared)
+
+# To try and upload use:
 s.send(:compress_and_save)
 s.send(:save_upload)
 ```