summaryrefslogtreecommitdiff
path: root/lib/support/nginx
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-01-27 11:59:15 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-01-27 11:59:15 +0100
commitabae12891553e16d31e172bfc63bb4672139d353 (patch)
tree51948b62348f9c6c3baab496eccf160c180e5154 /lib/support/nginx
parent7b32be6eb127e6fd911f7895ed7d396529030474 (diff)
downloadgitlab-ce-abae12891553e16d31e172bfc63bb4672139d353.tar.gz
Use either/or to present options
Diffstat (limited to 'lib/support/nginx')
-rw-r--r--lib/support/nginx/gitlab4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index 5f517a168f5..764c34dc691 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -4,8 +4,8 @@
# CHUNKED TRANSFER
# It is a known issue that Git-over-HTTP requires chunked transfer encoding [0] which is not
# supported by Nginx < 1.3.9 [1]. As a result, pushing a large object with Git (i.e. a single large file)
-# can lead to a 411 error. In theory you can get around this by tweaking this configuration file and
-# - installing an old version of Nginx with the chunkin module [2] compiled in;
+# can lead to a 411 error. In theory you can get around this by tweaking this configuration file and either
+# - installing an old version of Nginx with the chunkin module [2] compiled in, or
# - using a newer version of Nginx.
#
# At the time of writing we do not know if either of these theoretical solutions works. As a workaround