summaryrefslogtreecommitdiff
path: root/doc/integration/bitbucket.md
diff options
context:
space:
mode:
Diffstat (limited to 'doc/integration/bitbucket.md')
-rw-r--r--doc/integration/bitbucket.md12
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/integration/bitbucket.md b/doc/integration/bitbucket.md
index fa3b62ba7af..db7e7d74efe 100644
--- a/doc/integration/bitbucket.md
+++ b/doc/integration/bitbucket.md
@@ -42,7 +42,7 @@ to the end of the Bitbucket authorization callback URL.
- **Name:** This can be anything. Consider something like `<Organization>'s GitLab`
or `<Your Name>'s GitLab` or something else descriptive.
- - **Application description:** *(Optional)* Fill this in if you wish.
+ - **Application description:** Optional. Fill this in if you wish.
- **Callback URL:** (Required in GitLab versions 8.15 and greater)
The URL to your GitLab installation, such as
`https://gitlab.example.com/users/auth`.
@@ -87,10 +87,11 @@ to the end of the Bitbucket authorization callback URL.
```ruby
gitlab_rails['omniauth_providers'] = [
{
- "name" => "bitbucket",
- "app_id" => "BITBUCKET_APP_KEY",
- "app_secret" => "BITBUCKET_APP_SECRET",
- "url" => "https://bitbucket.org/"
+ name: "bitbucket",
+ # label: "Provider name", # optional label for login button, defaults to "Bitbucket"
+ app_id: "BITBUCKET_APP_KEY",
+ app_secret: "BITBUCKET_APP_SECRET",
+ url: "https://bitbucket.org/"
}
]
```
@@ -102,6 +103,7 @@ to the end of the Bitbucket authorization callback URL.
enabled: true
providers:
- { name: 'bitbucket',
+ # label: 'Provider name', # optional label for login button, defaults to "Bitbucket"
app_id: 'BITBUCKET_APP_KEY',
app_secret: 'BITBUCKET_APP_SECRET',
url: 'https://bitbucket.org/' }