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

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

Avoid instance variable re-use trouble

2015-09-02T16:47:56+00:00

This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.

Fix broken Wiki Page History

2015-09-02T06:29:27+00:00

Closes #2104

Closes #1751

Closes #1592

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

Merge branch 'gitlab-git-http-server' into 'master'

2015-09-01T14:21:45+00:00

Replace grack with gitlab-git-http-server

See merge request !1229

Replace grack with gitlab-git-http-server

2015-08-31T13:30:15+00:00

retrieving oauth token with LDAP credentials

2015-08-31T12:10:01+00:00

Dashboard activity as separate page

2015-08-25T12:13:04+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'reply-by-email-improvements' into 'master'

2015-08-24T21:56:07+00:00

Ignore empty incoming messages (Reply by email)

We should also update mail_room when https://github.com/tpitale/mail_room/pull/35 goes in, but that can wait a bit.

See merge request !1190

Ignore empty incoming messages.

2015-08-24T17:57:35+00:00

Only include base URL in OmniAuth full_host parameter

2015-08-23T20:31:02+00:00

Closes #2335