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>2020-03-25 09:07:58 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-25 09:07:58 +0300
commit9c83aadd2604e7e6cb1f84683f951e6b12872618 (patch)
treec0a14c87378e832e87580be382e1c8ccea188b71 /doc/integration/gitlab.md
parent23bc19cb73aad969c9636b8b935111645e809e54 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration/gitlab.md')
-rw-r--r--doc/integration/gitlab.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index e8c104bbe6f..36810e7c513 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -15,7 +15,7 @@ GitLab.com will generate an application ID and secret key for you to use.
- Name: This can be anything. Consider something like `<Organization>'s GitLab` or `<Your Name>'s GitLab` or something else descriptive.
- Redirect URI:
- ```
+ ```plaintext
http://your-gitlab.example.com/import/gitlab/callback
http://your-gitlab.example.com/users/auth/gitlab/callback
```
@@ -63,7 +63,7 @@ GitLab.com will generate an application ID and secret key for you to use.
For installations from source:
- ```
+ ```yaml
- { name: 'gitlab', app_id: 'YOUR_APP_ID',
app_secret: 'YOUR_APP_SECRET',
args: { scope: 'api' } }