diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-01-27 18:00:14 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-01-27 18:00:14 +0000 |
| commit | 297041368d0254b2dd3e08dc4b21ce43a28d2ae0 (patch) | |
| tree | 891316f289abfe6487d9a08392dd230b79c616ce | |
| parent | 4d4bdffd155f4bfc215d65083a16ee7daaa8b27e (diff) | |
| parent | 9086f4c41d9def52ebddf5b493550b897731ca40 (diff) | |
| download | gitlab-ci-297041368d0254b2dd3e08dc4b21ce43a28d2ae0.tar.gz | |
Merge branch 'b98-doc-callback' into 'master'
#98 Updated documentation with callback URL details.
See merge request !33
| -rw-r--r-- | doc/update/5.3-to-5.4.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/update/5.3-to-5.4.md b/doc/update/5.3-to-5.4.md index 51d7f77..8260714 100644 --- a/doc/update/5.3-to-5.4.md +++ b/doc/update/5.3-to-5.4.md @@ -38,7 +38,10 @@ bundle exec rake db:migrate RAILS_ENV=production ``` ### 5. Update config -GitLab CI 5.4 and above make use of the OAuth2 protocol for authentication with GitLab. This means that after updating GitLab (CI), you need to create an OAuth2 application in the user profile, which gives you the APP_ID and APP_SECRET. You will have to add this to the GitLab CI config, as such: +GitLab CI 5.4 and above make use of the OAuth2 protocol for authentication with GitLab. This means that after updating GitLab (CI), you need to create an OAuth2 application in the user profile, which gives you the APP_ID and APP_SECRET. +For callback URL use: `http://ci.example.com/user_sessions/callback` if you use http, or `https://ci.example.com/user_sessions/callback` if you use https. + +You will have to add this to the GitLab CI config, as such: ``` production: |