Add latest changes from gitlab-org/gitlab@master

6 files changed, 51 insertions, 109 deletions

diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md
index 498d577178f..dca5b5de436 100644
--- a/doc/user/application_security/dependency_scanning/index.md
+++ b/doc/user/application_security/dependency_scanning/index.md
@@ -309,7 +309,7 @@ table.supported-languages ul {
   <li>
     <a id="notes-regarding-supported-languages-and-package-managers-3"></a>
     <p>
-      npm is only supported when <code>lockfileVersion = 1</code> or <code>lockfileVersion = 2</code>. Work to add support for <code>lockfileVersion = 3</code> is being tracked in issue <a href="https://gitlab.com/gitlab-org/gitlab/-/issues/365176">GitLab#365176</a>.
+      npm is supported for <code>lockfileVersion = 1</code>, <code>lockfileVersion = 2</code>, and <code>lockfileVersion = 3</code>. Support for <code>lockfileVersion = 3</code> was <a href="https://gitlab.com/gitlab-org/gitlab/-/issues/365176">introduced</a> in GitLab 15.7</a>.
     </p>
   </li>
   <li>
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index 8a4843b9843..bd10560e138 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -123,7 +123,7 @@ It can also help to compare the XML response from your provider with our [exampl
 > - [Improved](https://gitlab.com/gitlab-org/gitlab/-/issues/215155) in GitLab 15.5 [with a flag](../../../administration/feature_flags.md) named `transparent_sso_enforcement` to include transparent enforcement even when SSO enforcement is not enabled. Disabled on GitLab.com.
 
 FLAG:
-On self-managed GitLab, transparent SSO enforcement is unavailable. On GitLab.com, transparent SSO enforcement is unavailable and can be configured by GitLab.com administrators only.
+On self-managed GitLab, transparent SSO enforcement is unavailable. On GitLab.com, see the [Transparent SSO rollout](https://gitlab.com/gitlab-org/gitlab/-/issues/375788) issue for the current status.
 
 SSO is enforced when users access groups and projects in the organization's group hierarchy. Users can view other groups and projects without SSO sign in.
 
@@ -177,6 +177,17 @@ When SSO is enforced, users are not immediately revoked. If the user:
 - Has an active session, they can continue accessing the group for up to 24 hours until the identity
   provider session times out.
 
+### Selectively enable and disable transparent SSO enforcement
+
+There are two feature flags associated with this feature to allow precise control. If a customer has a problem with transparent SSO on GitLab.com, GitLab can help troubleshoot and override the feature flag as necessary.
+
+**`transparent_sso_enforcement`:** This feature flag should only be enabled or disabled by the Authentication and Authorization group
+or in the case of a serious and widespread issue affecting many groups or users. See [issue 375788](https://gitlab.com/gitlab-org/gitlab/-/issues/375788) for the current GitLab.com rollout status.
+
+**`transparent_sso_enforcement_override`:** When the `transparent_sso_enforcement` feature flag is enabled, support or production teams can
+turn off transparent SSO by enabling this feature flag for a specific customer group. **Enabling** this feature flag
+disables transparent SSO enforcement.
+
 ## Providers
 
 The SAML standard means that you can use a wide range of identity providers with GitLab. Your identity provider might have relevant documentation. It can be generic SAML documentation or specifically targeted for GitLab.
@@ -337,11 +348,14 @@ When a user tries to sign in with Group SSO, GitLab attempts to find or create a
 
 ### Linking SAML to your existing GitLab.com account
 
+> **Remember me** checkbox [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/121569) in GitLab 15.7.
+
 To link SAML to your existing GitLab.com account:
 
 1. Sign in to your GitLab.com account. [Reset your password](https://gitlab.com/users/password/new) if necessary.
 1. Locate and visit the **GitLab single sign-on URL** for the group you're signing in to. A group owner can find this on the group's **Settings > SAML SSO** page. If the sign-in URL is configured, users can connect to the GitLab app from the identity provider.
-1. Optional. Select the **Remember me** checkbox to stay signed in to GitLab for 2 weeks. You may still be asked to re-authenticate with your SAML provider more frequently.
+1. Optional. Select the **Remember me** checkbox to stay signed in to GitLab for 2 weeks. You may still be asked to re-authenticate with your SAML provider
+   more frequently.
 1. Select **Authorize**.
 1. Enter your credentials on the identity provider if prompted.
 1. You are then redirected back to GitLab.com and should now have access to the group. In the future, you can use SAML to sign in to GitLab.com.
diff --git a/doc/user/group/saml_sso/troubleshooting.md b/doc/user/group/saml_sso/troubleshooting.md
index 521bec04c4a..f8075e62ecc 100644
--- a/doc/user/group/saml_sso/troubleshooting.md
+++ b/doc/user/group/saml_sso/troubleshooting.md
@@ -269,3 +269,15 @@ Pay particular attention to the following 403 errors:
 
 - `app_not_configured`
 - `app_not_configured_for_user`
+
+## SAML Name ID and email address do not match your user account **(PREMIUM SAAS)**
+
+If users encounter the error `SAML Name ID and email address do not match your user account. Contact an administrator.`
+this means:
+
+- The NameID value sent by SAML does not match the existing SAML identity `extern_uid` value.
+- Either the SAML response did not include an email address or the email address did not match the user's GitLab email address.
+
+A GitLab group Owner can use the [SAML API](../../../api/saml.md) to update the user's SAML `extern_uid`.
+The `extern_uid` value must match the Name ID value sent by the SAML identity provider (IdP). Depending on the IdP configuration
+this may be a generated unique ID, an email address, or other value.
diff --git a/doc/user/packages/nuget_repository/index.md b/doc/user/packages/nuget_repository/index.md
index 956202bb990..540db463f0a 100644
--- a/doc/user/packages/nuget_repository/index.md
+++ b/doc/user/packages/nuget_repository/index.md
@@ -118,27 +118,25 @@ A project-level endpoint is also required to install NuGet packages from a proje
 To use the [project-level](#use-the-gitlab-endpoint-for-nuget-packages) NuGet endpoint, add the Package Registry as a source with Visual Studio:
 
 1. Open [Visual Studio](https://visualstudio.microsoft.com/vs/).
-1. In Windows, select **File > Options**. On macOS, select **Visual Studio > Preferences**.
+1. In Windows, select **Tools > Options**. On macOS, select **Visual Studio > Preferences**.
 1. In the **NuGet** section, select **Sources** to view a list of all your NuGet sources.
 1. Select **Add**.
 1. Complete the following fields:
 
    - **Name**: Name for the source.
-   - **Location**: `https://gitlab.example.com/api/v4/projects/<your_project_id>/packages/nuget/index.json`,
+   - **Source**: `https://gitlab.example.com/api/v4/projects/<your_project_id>/packages/nuget/index.json`,
      where `<your_project_id>` is your project ID, and `gitlab.example.com` is
      your domain name.
-   - **Username**: Your GitLab username or deploy token username.
-   - **Password**: Your personal access token or deploy token.
-
-   ![Visual Studio Adding a NuGet source](img/visual_studio_adding_nuget_source.png)
 
 1. Select **Save**.
+1. When you access the package, you must enter your **Username** and **Password**:
 
-The source is displayed in your list.
+   - **Username**: Your GitLab username or deploy token username.
+   - **Password**: Your personal access token or deploy token.
 
-![Visual Studio NuGet source added](img/visual_studio_nuget_source_added.png)
+The source is displayed in your list.
 
-If you get a warning, ensure that the **Location**, **Username**, and
+If you get a warning, ensure that the **Source**, **Username**, and
 **Password** are correct.
 
 #### Group-level endpoint
@@ -148,27 +146,25 @@ To install a package from a group, use a group-level endpoint.
 To use the [group-level](#use-the-gitlab-endpoint-for-nuget-packages) NuGet endpoint, add the Package Registry as a source with Visual Studio:
 
 1. Open [Visual Studio](https://visualstudio.microsoft.com/vs/).
-1. In Windows, select **File > Options**. On macOS, select **Visual Studio > Preferences**.
+1. In Windows, select **Tools > Options**. On macOS, select **Visual Studio > Preferences**.
 1. In the **NuGet** section, select **Sources** to view a list of all your NuGet sources.
 1. Select **Add**.
 1. Complete the following fields:
 
    - **Name**: Name for the source.
-   - **Location**: `https://gitlab.example.com/api/v4/groups/<your_group_id>/-/packages/nuget/index.json`,
+   - **Source**: `https://gitlab.example.com/api/v4/groups/<your_group_id>/-/packages/nuget/index.json`,
      where `<your_group_id>` is your group ID, and `gitlab.example.com` is
      your domain name.
-   - **Username**: Your GitLab username or deploy token username.
-   - **Password**: Your personal access token or deploy token.
-
-   ![Visual Studio Adding a NuGet source](img/visual_studio_adding_nuget_source.png)
 
 1. Select **Save**.
+1. When you access the package, you must enter your **Username** and **Password**.
 
-The source is displayed in your list.
+   - **Username**: Your GitLab username or deploy token username.
+   - **Password**: Your personal access token or deploy token.
 
-![Visual Studio NuGet source added](img/visual_studio_nuget_source_added.png)
+The source is displayed in your list.
 
-If you get a warning, ensure that the **Location**, **Username**, and
+If you get a warning, ensure that the **Source**, **Username**, and
 **Password** are correct.
 
 ### Add a source with the .NET CLI
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index 5753b0a5b97..2cd4c3650b1 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -18,7 +18,7 @@ See these documents to migrate to GitLab:
 - [From GitLab.com](gitlab_com.md)
 - [From Gitea](gitea.md)
 - [From Perforce](perforce.md)
-- [From SVN](svn.md)
+- [From SVN](https://git-scm.com/book/en/v2/Git-and-Other-Systems-Git-as-a-Client)
 - [From TFVC](tfvc.md)
 - [From repository by URL](repo_by_url.md)
 - [By uploading a manifest file (AOSP)](manifest.md)
diff --git a/doc/user/project/import/svn.md b/doc/user/project/import/svn.md
index 1687d621e2e..6730ef862e6 100644
--- a/doc/user/project/import/svn.md
+++ b/doc/user/project/import/svn.md
@@ -1,91 +1,11 @@
 ---
-type: howto
-stage: Manage
-group: Import
-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
+redirect_to: 'index.md'
+remove_date: '2023-03-15'
 ---
 
-# Migrate from Subversion to GitLab **(FREE)**
+This document was moved to [another location](index.md).
 
-GitLab uses Git as its version control system. If you're using Subversion (SVN) as your version control system,
-you can migrate to using a Git repository in GitLab using `svn2git`.
-
-You can follow the steps on this page to migrate to Git if your SVN repository:
-
-- Has a standard format (trunk, branches, and tags).
-- Is not nested.
-
-For a non-standard repository see the [`svn2git` documentation](https://github.com/nirvdrum/svn2git).
-
-We recommend a hard cut over from SVN to Git and GitLab. Run the migration command once and then have all users use the
-new GitLab repository immediately.
-
-## Install `svn2git`
-
-Install `svn2git` on a local workstation rather than the GitLab server:
-
-- On all systems you can install as a Ruby gem if you already have Ruby and Git installed:
-
-  ```shell
-  sudo gem install svn2git
-  ```
-
-- On Debian-based Linux distributions you can install the native packages:
-
-  ```shell
-  sudo apt-get install git-core git-svn ruby
-  ```
-
-## Prepare an authors file (recommended)
-
-Prepare an authors file so `svn2git` can map SVN authors to Git authors. If you choose not to create the authors file,
-commits are not attributed to the correct GitLab user.
-
-To map authors, you must map every author present on changes in the SVN repository. If you don't, the
-migration fails and you have to update the author file accordingly.
-
-1. Search through the SVN repository and output a list of authors:
-
-   ```shell
-   svn log --quiet | grep -E "r[0-9]+ \| .+ \|" | cut -d'|' -f2 | sed 's/ //g' | sort | uniq
-   ```
-
-1. Use the output from the last command to construct the authors file. Create a file called `authors.txt` and add one
-   mapping per line. For example:
-
-   ```plaintext
-   sidneyjones = Sidney Jones <sidneyjones@example.com>
-   ```
-
-## Migrate SVN repository to Git repository
-
-`svn2git` supports excluding certain file paths, branches, tags, and more. See
-the [`svn2git` documentation](https://github.com/nirvdrum/svn2git) or run `svn2git --help` for full documentation on all of
-the available options.
-
-For each repository to migrate:
-
-1. Create a new directory and change into it.
-1. For repositories that:
-
-   - Don't require a username and password, run:
-
-     ```shell
-     svn2git https://svn.example.com/path/to/repo --authors /path/to/authors.txt
-     ```
-
-   - Do require a username and password, run:
-
-     ```shell
-     svn2git https://svn.example.com/path/to/repo --authors /path/to/authors.txt --username <username> --password <password>
-     ```
-
-1. Create a new GitLab project for your migrated code.
-1. Copy the SSH or HTTP(S) repository URL from the GitLab project page.
-1. Add the GitLab repository as a Git remote and push all the changes. This pushes all commits, branches, and tags.
-
-   ```shell
-   git remote add origin git@gitlab.example.com:<group>/<project>.git
-   git push --all origin
-   git push --tags origin
-   ```
+<!-- This redirect file can be deleted after <2023-03-15>. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->