Add latest changes from gitlab-org/gitlab@15-8-stable-ee

6 files changed, 44 insertions, 18 deletions

diff --git a/doc/api/import.md b/doc/api/import.md
index 407f1974f7d..67ee7bc60a1 100644
--- a/doc/api/import.md
+++ b/doc/api/import.md
@@ -122,11 +122,12 @@ Returns the following status codes:
 
 ## Import GitHub gists into GitLab snippets
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/371099) in GitLab 15.8 [with a flag](../administration/feature_flags.md) named `github_import_gists`. Disabled by default.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/371099) in GitLab 15.8 [with a flag](../administration/feature_flags.md) named `github_import_gists`. Disabled by default. Enabled on GitLab.com.
 
 FLAG:
 On self-managed GitLab, by default this feature is not available. To make it available,
 ask an administrator to [enable the feature flag](../administration/feature_flags.md) named `github_import_gists`.
+On GitLab.com, this feature is available.
 
 You can use the GitLab API to import personal GitHub gists (with up to 10 files) into personal GitLab snippets.
 GitHub gists with more than 10 files are skipped. You should manually migrate these GitHub gists.
diff --git a/doc/raketasks/backup_gitlab.md b/doc/raketasks/backup_gitlab.md
index 771120df1c3..ffa67c6b4a9 100644
--- a/doc/raketasks/backup_gitlab.md
+++ b/doc/raketasks/backup_gitlab.md
@@ -416,6 +416,9 @@ GitLab also [imports cloud drivers](https://gitlab.com/gitlab-org/gitlab/-/blob/
 for AWS, Google, OpenStack Swift, Rackspace, and Aliyun. A local driver is
 [also available](#upload-to-locally-mounted-shares).
 
+NOTE:
+Support for Openstack Swift and Rackspace APIs will be removed in GitLab 15.10. See [issue #387976](https://gitlab.com/gitlab-org/gitlab/-/issues/387976) for more information.
+
 [Read more about using object storage with GitLab](../administration/object_storage.md).
 
 #### Using Amazon S3
diff --git a/doc/topics/plan_and_track.md b/doc/topics/plan_and_track.md
index 8b1fb1657a0..d79a8ad066b 100644
--- a/doc/topics/plan_and_track.md
+++ b/doc/topics/plan_and_track.md
@@ -21,31 +21,21 @@ with [Scaled Agile Framework (SAFe)](https://about.gitlab.com/solutions/agile-de
 
 <!-- vale gitlab.Spelling = YES -->
 
-## Basic workflow features
-
-Planning features everyone needs to use day-to-day.
-
-- [Keyboard shortcuts](../user/shortcuts.md)
-- [Markdown](../user/markdown.md)
-- [Quick actions](../user/project/quick_actions.md)
-- [To-Do lists](../user/todos.md)
-- [Using Git](../topics/git/index.md)
-
 ## Team planning
 
 Get work done as a team.
 
-- [Comments and threads](../user/discussions/index.md)
-- [Customer relations (CRM)](../user/crm/index.md)
-  - [Contacts](../user/crm/index.md#contacts)
-  - [Organizations](../user/crm/index.md#organizations)
-- [Issues](../user/project/issues/index.md)
-- [Iterations](../user/group/iterations/index.md)
 - [Labels](../user/project/labels.md)
+- [Iterations](../user/group/iterations/index.md)
 - [Milestones](../user/project/milestones/index.md)
-- [Requirements](../user/project/requirements/index.md)
+- [Issues](../user/project/issues/index.md)
+- [Comments and threads](../user/discussions/index.md)
 - [Tasks](../user/tasks.md)
+- [Requirements](../user/project/requirements/index.md)
 - [Time tracking](../user/project/time_tracking.md)
+- [Customer relations (CRM)](../user/crm/index.md)
+  - [Contacts](../user/crm/index.md#contacts)
+  - [Organizations](../user/crm/index.md#organizations)
 - [Wikis](../user/project/wiki/index.md)
 
 ## Portfolio management
@@ -59,3 +49,13 @@ Align your work across teams.
 - [Roadmaps](../user/group/roadmap/index.md)
 - [Planning hierarchies](../user/group/planning_hierarchy/index.md)
 - [Objectives and key results](../user/okrs.md)
+
+## Basic workflow features
+
+Use these day-to-day planning features.
+
+- [Keyboard shortcuts](../user/shortcuts.md)
+- [Quick actions](../user/project/quick_actions.md)
+- [Markdown](../user/markdown.md)
+- [To-Do List](../user/todos.md)
+- [Using Git](../topics/git/index.md)
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index e4c2f149653..cfee3263db8 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -99,6 +99,24 @@ Because Cloud Native Buildpacks do not support automatic testing, the Auto Test
 
 </div>
 
+<div class="deprecation removal-1510 breaking-change">
+
+### Automatic backup upload using Openstack Swift and Rackspace APIs
+
+End of Support: GitLab <span class="removal-milestone">15.10</span> <span class="support-end-date"></span><br />
+Planned removal: GitLab <span class="removal-milestone">15.10</span> <span class="removal-date"></span>
+
+WARNING:
+This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/).
+Review the details carefully before upgrading.
+
+We are deprecating support for [uploading backups to remote storage](https://docs.gitlab.com/ee/raketasks/backup_gitlab.html#upload-backups-to-a-remote-cloud-storage) using Openstack Swift and Rackspace APIs. The support for these APIs depends on third-party libraries that are no longer actively maintained and have not been updated for  Ruby 3. GitLab is switching over to Ruby 3 prior to EOL of Ruby 2 in order to stay up to date on security patches.
+
+- If you're using OpenStack, you need to change you configuration to use the S3 API instead of Swift.
+- If you're using Rackspace storage, you need to switch to a different provider or manually upload the backup file after the backup task is complete.
+
+</div>
+
 <div class="deprecation removal-160 breaking-change">
 
 ### Azure Storage Driver defaults to the correct root prefix
diff --git a/doc/user/admin_area/appearance.md b/doc/user/admin_area/appearance.md
index fc42c7770f2..a65c0c86649 100644
--- a/doc/user/admin_area/appearance.md
+++ b/doc/user/admin_area/appearance.md
@@ -38,6 +38,8 @@ of the page to activate it in the GitLab instance.
 
 ## System header and footer messages
 
+> **Enable header and footer in emails** checkbox [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/344819) in GitLab 15.9.
+
 You can add a small header message, a small footer message, or both, to the interface
 of your GitLab instance. These messages appear on all projects and pages of the
 instance, including the sign in / sign up page. The default color is white text on
diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md
index 83cf47d508c..cc195c3c959 100644
--- a/doc/user/project/service_desk.md
+++ b/doc/user/project/service_desk.md
@@ -113,6 +113,8 @@ With Service Desk, you can use templates for:
 
 #### Email header and footer **(FREE SELF)**
 
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/344819) in GitLab 15.9.
+
 Instance administrators can add a small header or footer to the GitLab instance and make them
 visible in the email template. For more information, see
 [System header and footer messages](../admin_area/appearance.md#system-header-and-footer-messages).