diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-12-14 08:21:47 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-12-14 08:21:47 +0000 |
| commit | c80f34257dc389369801eb112506706d46051bb1 (patch) | |
| tree | c99db8cb0fd8a7b0037013db5cb2d3dec739c8bb | |
| parent | 485e910085f34388b86909f86dd7a999a585476d (diff) | |
| parent | 41f5bb035bd648c6fb0023bfbfb5ae40551cb180 (diff) | |
| download | gitlab-ce-c80f34257dc389369801eb112506706d46051bb1.tar.gz | |
Merge branch 'use-gitlab-workhorse-in-doc' into 'master'
Rename mention of gitlab-git-http-server to gitlab-workhorse
[ci skip]
Closes https://github.com/gitlabhq/gitlabhq/issues/9904
See merge request !2092
| -rw-r--r-- | doc/update/8.1-to-8.2.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/update/8.1-to-8.2.md b/doc/update/8.1-to-8.2.md index b08a79ca0aa..46dfa2232b4 100644 --- a/doc/update/8.1-to-8.2.md +++ b/doc/update/8.1-to-8.2.md @@ -142,7 +142,7 @@ git diff origin/8-1-stable:lib/support/nginx/gitlab origin/8-2-stable:lib/suppor If you are using Apache instead of NGINX please see the updated [Apache templates]. 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 +will need to let gitlab-workhorse listen on a TCP port. You can do this via [/etc/default/gitlab]. [Apache templates]: https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache |