Update documentation and config files

1 files changed, 22 insertions, 4 deletions

diff --git a/doc/update/7.14-to-8.0.md b/doc/update/7.14-to-8.0.md
index 3ae0f9616ac..b81b6a59980 100644
--- a/doc/update/7.14-to-8.0.md
+++ b/doc/update/7.14-to-8.0.md
@@ -91,7 +91,18 @@ If your Git repositories are in a directory other than `/home/git/repositories`,
 you need to tell `gitlab-git-http-server` about it via `/etc/gitlab/default`.
 See `lib/support/init.d/gitlab.default.example` for the options.
 
-### 6. Install libs, migrations, etc.
+### 6. Copy secrets
+
+The `secrets.yml` file is used to store keys to encrypt sessions and encrypt secure variables.
+When you run migrations make sure to store it someplace safe.
+Don't store it in the same place as your database backups,
+otherwise your secrets are exposed if one of your backups is compromised.
+
+```
+sudo -u gitlab_ci -H cp config/secrets.yml.example config/secrets.yml
+sudo -u gitlab_ci -H chmod 0600 config/secrets.yml
+
+### 7. Install libs, migrations, etc.
 
 ```bash
 cd /home/git/gitlab
@@ -112,7 +123,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
 sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
 ```
 
-### 7. Update config files
+### 8. Update config files
 
 #### New configuration options for `gitlab.yml`
 
@@ -122,6 +133,8 @@ There are new configuration options available for [`gitlab.yml`](config/gitlab.y
 git diff origin/7-14-stable:config/gitlab.yml.example origin/8-0-stable:config/gitlab.yml.example
 ```
 
+The new options include configuration of GitLab CI that are now being part of GitLab CE and EE.
+
 #### New Nginx configuration
 
 Because of the new `gitlab-git-http-server` you need to update your Nginx
@@ -139,12 +152,17 @@ git diff origin/7-14-stable:lib/support/nginx/gitlab-ssl origin/8-0-stable:lib/s
 git diff origin/7-14-stable:lib/support/nginx/gitlab origin/8-0-stable:lib/support/nginx/gitlab
 ```
 
-### 8. Start application
+### 9. Migrate GitLab CI to GitLab CE/EE
+
+Now, GitLab CE and EE has CI integrated. However, migrations don't happen automatically and you need to do it manually.
+Please follow the following guide [to migrate](../migrate/README.md) your GitLab CI instance to GitLab CE/EE.
+
+### 10. Start application
 
     sudo service gitlab start
     sudo service nginx restart
 
-### 9. Check application status
+### 11. Check application status
 
 Check if GitLab and its environment are configured correctly: