diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-23 22:11:58 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-23 22:11:58 +0000 |
commit | 3540fb595542b690806d83412f93e2e651c029d4 (patch) | |
tree | c32fc303e4f279133ec7c4f9d29c4218cc6ffa0a | |
parent | ba1a96df317eac0848beb7bc591b4897643cd012 (diff) | |
parent | 15c929495c298473daaa2d27e54ff9010040c8bc (diff) | |
download | gitlab-ci-3540fb595542b690806d83412f93e2e651c029d4.tar.gz |
Merge branch 'update_doc' into 'master'
Added OAuth2 section to update doc
See merge request !107
-rw-r--r-- | doc/update/5.3-to-5.4.md | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/doc/update/5.3-to-5.4.md b/doc/update/5.3-to-5.4.md index 045a610..51d7f77 100644 --- a/doc/update/5.3-to-5.4.md +++ b/doc/update/5.3-to-5.4.md @@ -37,6 +37,19 @@ bundle install --without mysql development test --deployment bundle exec rake db:migrate RAILS_ENV=production ``` -### 5. Start web application +### 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: + +``` +production: + gitlab_server: + url: 'http://gitlab.example.com' + app_id: XXXXXX + app_secret: XXXXXX + +``` + + +### 6. Start web application sudo service gitlab_ci start |