Merge branch 'doc_update' into 'master'

Documentation update

See merge request !110

2 files changed, 24 insertions, 5 deletions

diff --git a/doc/install/installation.md b/doc/install/installation.md
index b12efbe..17cb5a0 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -200,8 +200,25 @@ Make sure to edit the config file to match your setup:
 
     sudo /etc/init.d/nginx start
 
+# 9. GitLab OAuth2 application
 
-# 9. Runners
+
+You should go to the admin area of the GitLab to "Application" section. Create an application for the GtiLab CI
+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:
+  gitlab_server:
+    url: 'http://gitlab.example.com'
+    app_id: XXXXXX
+    app_secret: XXXXXX
+
+```
+
+
+# 10. Runners
 
 
 Now you need Runners to process your builds.
@@ -211,7 +228,7 @@ Checkout [runner repository](https://gitlab.com/gitlab-org/gitlab-ci-runner/blob
 
 
 Visit YOUR_SERVER for your first GitLab CI login.
-You should use your GitLab credentials in order to login
+You will be asked to authorize with your GitLab credentials.
 
 **Enjoy!**
 
diff --git a/doc/update/5.3-to-5.4.md b/doc/update/5.3-to-5.4.md
index 8260714..6d1cd61 100644
--- a/doc/update/5.3-to-5.4.md
+++ b/doc/update/5.3-to-5.4.md
@@ -38,10 +38,12 @@ 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. 
-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.
+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 GitLab admin area, which gives you the APP_ID and APP_SECRET. 
 
-You will have to add this to the GitLab CI config, as such:
+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 APP_ID and APP_SECRET to the GitLab CI config, as such:
 
 ```
 production: