Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 6 insertions, 2 deletions

diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index 02705d9dec3..fee1e573384 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -77,7 +77,7 @@ GitLab.com generates an application ID and secret key for you to use.
        app_id: "YOUR_APP_ID",
        app_secret: "YOUR_APP_SECRET",
        args: { scope: "read_user" # optional: defaults to the scopes of the application
-             , client_options: { site: "https://gitlab.example.com/api/v4" } }
+             , client_options: { site: "https://gitlab.example.com" } }
      }
    ]
    ```
@@ -98,9 +98,13 @@ GitLab.com generates an application ID and secret key for you to use.
        label: 'Provider name', # optional label for login button, defaults to "GitLab.com"
        app_id: 'YOUR_APP_ID',
        app_secret: 'YOUR_APP_SECRET',
-       args: { "client_options": { "site": 'https://gitlab.example.com/api/v4' } }
+       args: { "client_options": { "site": 'https://gitlab.example.com' } }
    ```
 
+   NOTE:
+   In GitLab 15.1 and earlier, the `site` parameter requires an `/api/v4` suffix.
+   We recommend you drop this suffix after you upgrade to GitLab 15.2 or later.
+
 1. Change `'YOUR_APP_ID'` to the Application ID from the GitLab.com application page.
 1. Change `'YOUR_APP_SECRET'` to the secret from the GitLab.com application page.
 1. Save the configuration file.