diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-24 17:01:15 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-24 17:01:15 +0000 |
| commit | 3c8b2cccca88263a4dd5512b050dc3f11f9d9f3e (patch) | |
| tree | 7b61aecd3f77caa008de68915cccd21e7df67630 | |
| parent | c4ca1ad4c33bc90074a9321e9cd5a2404a62cc92 (diff) | |
| parent | 040718e10695e7d59e1aa06fd0a91b04ef692014 (diff) | |
| download | gitlab-ce-3c8b2cccca88263a4dd5512b050dc3f11f9d9f3e.tar.gz | |
Merge branch 'reference-apache-templates-8.0' into 'master'
Refer to Apache templates in 8.0 update guide
[ci skip]
See merge request !1426
| -rw-r--r-- | doc/update/7.14-to-8.0.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/update/7.14-to-8.0.md b/doc/update/7.14-to-8.0.md index 2c7003ed063..c2b06fe1ab1 100644 --- a/doc/update/7.14-to-8.0.md +++ b/doc/update/7.14-to-8.0.md @@ -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 ``` +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 Now, GitLab CE and EE has CI integrated. However, migrations don't happen automatically and you need to do it manually. |