summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/update/8.0-to-8.1.md13
1 files changed, 3 insertions, 10 deletions
diff --git a/doc/update/8.0-to-8.1.md b/doc/update/8.0-to-8.1.md
index 34d7c25a461..43c06609f4d 100644
--- a/doc/update/8.0-to-8.1.md
+++ b/doc/update/8.0-to-8.1.md
@@ -148,8 +148,6 @@ There are new configuration options available for [`gitlab.yml`](config/gitlab.y
git diff origin/8-0-stable:config/gitlab.yml.example origin/8-1-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
@@ -170,12 +168,7 @@ git diff origin/8-0-stable:lib/support/nginx/gitlab origin/8-1-stable:lib/suppor
If you are using Apache instead of NGINX please see the updated [Apache templates](https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache).
Also note that because Apache does not support upstreams behind Unix sockets you will need to let gitlab-git-http-server listen on a TCP port. You can do this via [/etc/default/gitlab](https://gitlab.com/gitlab-org/gitlab-ce/blob/8-0-stable/lib/support/init.d/gitlab.default.example#L34).
-### 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_ci_to_ce/README.md) your GitLab CI instance to GitLab CE/EE.
-
-### 10. Use Redis v2.4.0+
+### 9. Use Redis v2.4.0+
Previous versions of GitLab allowed Redis versions >= 2.0 to be used, but
Sidekiq jobs could fail due to lack of support for the SREM command. GitLab
@@ -184,12 +177,12 @@ with the following command:
redis-cli info | grep redis_version
-### 11. Start application
+### 10. Start application
sudo service gitlab start
sudo service nginx restart
-### 12. Check application status
+### 11. Check application status
Check if GitLab and its environment are configured correctly: