Merge branch 'reference-apache-templates-8.0' into 'master'

Refer to Apache templates in 8.0 update guide

[ci skip]

See merge request !1426
This commit is contained in:
Robert Speicher 2015-09-24 17:01:15 +00:00
commit 3c8b2cccca
1 changed files with 2 additions and 0 deletions

View File

@ -153,6 +153,8 @@ 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 git diff origin/7-14-stable:lib/support/nginx/gitlab origin/8-0-stable:lib/support/nginx/gitlab
``` ```
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).
### 9. Migrate GitLab CI to GitLab CE/EE ### 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. Now, GitLab CE and EE has CI integrated. However, migrations don't happen automatically and you need to do it manually.