gitlab: Merge in nginx config updates
authorKirill Smelkov <kirr@nexedi.com>
Thu, 11 Feb 2016 12:13:34 +0000 (15:13 +0300)
committerKirill Smelkov <kirr@nexedi.com>
Thu, 11 Feb 2016 12:13:34 +0000 (15:13 +0300)
commit14fafdf536ab0a3b4388d3d2f6c2847817663420
tree6cdf0bbe8f3e175d40337605ad50ea64df542b8d
parent468d7934815e19d166541f4b2a2424b32b6efc1b
parentd17f1f5fdbf8c0e7a1d04de67233523f7152dc0a
gitlab: Merge in nginx config updates

Like wih gitlab configs, this does only pure merge. We will
slaposify / adjust to updates in the following patches.

/cc @kazuhiko, @jerome
software/gitlab/template/nginx-gitlab-http.conf.in
software/gitlab/template/nginx.conf.in