Commit abae12891553e16d31e172bfc63bb4672139d353

Authored by Jacob Vosmaer
1 parent 7b32be6e

Use either/or to present options

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
lib/support/nginx/gitlab
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
4 # CHUNKED TRANSFER 4 # CHUNKED TRANSFER
5 # It is a known issue that Git-over-HTTP requires chunked transfer encoding [0] which is not 5 # It is a known issue that Git-over-HTTP requires chunked transfer encoding [0] which is not
6 # supported by Nginx < 1.3.9 [1]. As a result, pushing a large object with Git (i.e. a single large file) 6 # supported by Nginx < 1.3.9 [1]. As a result, pushing a large object with Git (i.e. a single large file)
7 -# can lead to a 411 error. In theory you can get around this by tweaking this configuration file and  
8 -# - installing an old version of Nginx with the chunkin module [2] compiled in; 7 +# can lead to a 411 error. In theory you can get around this by tweaking this configuration file and either
  8 +# - installing an old version of Nginx with the chunkin module [2] compiled in, or
9 # - using a newer version of Nginx. 9 # - using a newer version of Nginx.
10 # 10 #
11 # At the time of writing we do not know if either of these theoretical solutions works. As a workaround 11 # At the time of writing we do not know if either of these theoretical solutions works. As a workaround