summaryrefslogtreecommitdiff
path: root/doc/integration/twitter.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-19 09:13:48 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-19 09:13:48 +0000
commit94ecc00f47df7051eea905a5899053bf476e0589 (patch)
treec029c736afbfaa0acc7f2c00945548bbcc3515a5 /doc/integration/twitter.md
parent1bc62c0edcc5ffddc2c48dd6746b81c19f1c0ffa (diff)
downloadgitlab-ce-94ecc00f47df7051eea905a5899053bf476e0589.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration/twitter.md')
-rw-r--r--doc/integration/twitter.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/integration/twitter.md b/doc/integration/twitter.md
index 50ef04681f0..e1f67df76c3 100644
--- a/doc/integration/twitter.md
+++ b/doc/integration/twitter.md
@@ -62,9 +62,10 @@ Twitter. Twitter generates a client ID and secret key for you to use.
```ruby
gitlab_rails['omniauth_providers'] = [
{
- "name" => "twitter",
- "app_id" => "YOUR_APP_ID",
- "app_secret" => "YOUR_APP_SECRET"
+ name: "twitter",
+ # label: "Provider name", # optional label for login button, defaults to "Twitter"
+ app_id: "YOUR_APP_ID",
+ app_secret: "YOUR_APP_SECRET"
}
]
```
@@ -73,6 +74,7 @@ Twitter. Twitter generates a client ID and secret key for you to use.
```yaml
- { name: 'twitter',
+ # label: 'Provider name', # optional label for login button, defaults to "Twitter"
app_id: 'YOUR_APP_ID',
app_secret: 'YOUR_APP_SECRET' }
```