delta/gitlab/gitlab-ce.git/features/steps, 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

Fix this crazy random failing test

2015-09-04T13:36:25+00:00

Signed-off-by: Dmitriy Zaporozhets

Fix failing test

2015-09-04T12:53:25+00:00

Signed-off-by: Dmitriy Zaporozhets

Fix tests

2015-09-03T20:25:52+00:00

Signed-off-by: Dmitriy Zaporozhets

Fix tests

2015-09-03T20:15:21+00:00

Signed-off-by: Dmitriy Zaporozhets

Fix tests and update CHANGELOG

2015-09-02T18:02:26+00:00

Signed-off-by: Dmitriy Zaporozhets

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 'enable_ssl_verification_web_hook' into 'master'

2015-08-26T16:06:02+00:00

Enable SSL verification for Webhooks

https://dev.gitlab.org/gitlab/gitlabhq/issues/2121

See merge request !1135

Enable SSL verification for Webhooks

2015-08-26T12:48:31+00:00

Merge branch 'separate-activity' into 'master'

2015-08-25T16:19:12+00:00

Separate activity page

Move activity to separate page.

Part of #2225

![Screenshot_2015-08-25_15.07.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2126b22ed7b98a2f748c96ad60bc8b2e/Screenshot_2015-08-25_15.07.23.png)

See merge request !1198