delta/gitlab/gitlab-ce.git, branch nginx-git-http

The good stuff needs NGINX 1.7.11

2015-09-07T12:59:32+00:00

Do not let NGINX buffer Git HTTP requests

2015-09-07T11:05:29+00:00

Before this change NGINX would convert a chunked HTTP POST (e.g.
git push) into a HTTP 1.0 single large POST. This creates an
unnecessary delay, and it creates unnecessary memory pressure on
gitlab-git-http-server.

For the response ('proxy_buffering') I am less sure that NGINX 's
buffering behavior is harmful, but it still makes more sense to me
not to interfere with gitlab-git-http-server (and the Golang net/http
server).

Merge branch 'annotate-models' into 'master'

2015-09-07T09:58:51+00:00

Re-annotate models

See merge request !1253

Merge branch 'url-builder-fix-for-relative-urls' into 'master'

2015-09-07T09:57:05+00:00

Fix URL construction for merge requests, issues, notes, and commits for relative URL config

This MR fixes the constructor of URL links for systems using relative URLs in the application config. The `host` parameter was used improperly, supplying an extra path (e.g. https://mydomain.com/gitlab) and unnecessary scheme. We should be able to default to the URL options set in `8_default_url_options.rb` file.

Closes https://github.com/gitlabhq/gitlabhq/issues/9605

See merge request !1250

Merge branch 'fix-wiki-page-history' into 'master'

2015-09-07T09:27:48+00:00

Fix broken Wiki Page History

This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes.

Closes #2104

Closes #1751

Closes #1592

Closes https://github.com/gitlabhq/gitlabhq/issues/9399

See merge request !1232

Merge branch 'rs-dev-issue-2466' into 'master'

2015-09-07T09:20:00+00:00

Remove style attribute from textarea during ZenMode activation

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466

Closes https://github.com/gitlabhq/gitlabhq/issues/8963

See merge request !1248

Merge branch 'rs-highlight-new-notes' into 'master'

2015-09-07T09:09:37+00:00

Add syntax highlight scheme to notes rendered client-side

See merge request !1249

Merge branch 'upgrade-redis-required-check' into 'master'

2015-09-07T07:39:58+00:00

Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957

Closes #2222

Closes #2445

See merge request !1251

Merge branch 'fix-extra-slash-in-gitlab-shell-doc' into 'master'

2015-09-06T15:41:19+00:00

Use File.join to prevent extra slash in help message from appearing. Before:

```
Try fixing it:
sudo -u git -H /opt/gitlab/embedded/service/gitlab-shell//bin/create-hooks
```

See merge request !1252

Re-annotate models

2015-09-06T14:48:48+00:00