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

Fix "Reload with full diff" URL button in compare branch view

2015-08-25T06:35:26+00:00

This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.

Merge branch 'master' into remove-satellites

2015-08-11T20:48:55+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'check-out-branch-button' into 'master'

2015-08-11T17:49:06+00:00


Add "Check out branch" button to the MR page.

I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. 

Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120.

![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png)

It looks even better in combination with !1121, which gets rid of the "If you want to ..." line:

![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png)

cc @dzaporozhets @rspeicher 

See merge request !1116