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:
Diffstat (limited to 'doc/integration/gitlab.md')
-rw-r--r--doc/integration/gitlab.md20
1 files changed, 12 insertions, 8 deletions
diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index b69147b3829..2dd357e50a6 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -53,10 +53,11 @@ GitLab.com generates an application ID and secret key for you to use.
```ruby
gitlab_rails['omniauth_providers'] = [
{
- "name" => "gitlab",
- "app_id" => "YOUR_APP_ID",
- "app_secret" => "YOUR_APP_SECRET",
- "args" => { "scope" => "api" }
+ name: "gitlab",
+ # label: "Provider name", # optional label for login button, defaults to "GitLab.com"
+ app_id: "YOUR_APP_ID",
+ app_secret: "YOUR_APP_SECRET",
+ args: { scope: "api" }
}
]
```
@@ -66,10 +67,11 @@ GitLab.com generates an application ID and secret key for you to use.
```ruby
gitlab_rails['omniauth_providers'] = [
{
- "name" => "gitlab",
- "app_id" => "YOUR_APP_ID",
- "app_secret" => "YOUR_APP_SECRET",
- "args" => { "scope" => "api", "client_options" => { "site" => "https://gitlab.example.com/api/v4" } }
+ name: "gitlab",
+ label: "Provider name", # optional label for login button, defaults to "GitLab.com"
+ app_id: "YOUR_APP_ID",
+ app_secret: "YOUR_APP_SECRET",
+ args: { scope: "api", client_options: { site: "https://gitlab.example.com/api/v4" } }
}
]
```
@@ -78,6 +80,7 @@ GitLab.com generates an application ID and secret key for you to use.
```yaml
- { name: 'gitlab',
+ # label: 'Provider name', # optional label for login button, defaults to "GitLab.com"
app_id: 'YOUR_APP_ID',
app_secret: 'YOUR_APP_SECRET',
args: { scope: 'api' } }
@@ -87,6 +90,7 @@ GitLab.com generates an application ID and secret key for you to use.
```yaml
- { name: 'gitlab',
+ label: 'Provider name', # optional label for login button, defaults to "GitLab.com"
app_id: 'YOUR_APP_ID',
app_secret: 'YOUR_APP_SECRET',
args: { scope: 'api', "client_options": { "site": 'https://gitlab.example.com/api/v4' } }