Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-02-21 15:16:55 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-02-21 15:16:55 +0300
commit0ad1c3fb54e60b8276542d5a401533f7aff92b00 (patch)
treea1be4d2665e102cc3f805891904d33923586e5bc /doc/integration/gitlab.md
parent0976c2c3d9b722acce50120ea4a09d0e83f50d6e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration/gitlab.md')
-rw-r--r--doc/integration/gitlab.md5
1 files changed, 1 insertions, 4 deletions
diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index 74ae9bb1998..9d812ef72cd 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -62,9 +62,7 @@ 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: { scope: "read_user" # optional: defaults to the scopes of the application
- , client_options: { site: "https://gitlab.example.com/api/v4" }
- }
+ args: { scope: "read_user" } # optional: defaults to the scopes of the application
}
]
```
@@ -91,7 +89,6 @@ 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' } }
```
Or, for installations from source to authenticate against a different GitLab instance: