delta/gitlab/gitlab-ce.git, branch patch-8

Update html link to markdown link

2016-12-15T14:57:28+00:00

applying style guide fixes

2016-12-15T14:29:54+00:00

Clarify instructions for importing Wiki/Merge Request data

2016-12-13T20:05:46+00:00

Merge branch 'api-cherry-pick' into 'master'

2016-12-13T19:23:34+00:00


Adds the ability to cherry pick a commit via the API. Right now it only supports to directly cherry pick a commit and not starting a MR from it. Shall we do that also for the API?

Closes #25450

See merge request !8047

Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master'

2016-12-13T19:15:07+00:00


For single line Git commit messages, the close quote should be on the same line as the open quote

_Originally opened at !7299 by @jzinn._

- - -

## What does this MR do?

Chomps merge commit messages so that there is not a dangling close quote.

A better solution would be not to use quotes at all, but to set off the message in a `` with a background color.

## Screenshots (if relevant)

![Screen_Shot_2016-11-04_at_8.06.54_PM](/uploads/6e749c5227d88a9bfea64e70cccaf14a/Screen_Shot_2016-11-04_at_8.06.54_PM.png)

See merge request !7975

Merge branch '25482-fix-api-sudo' into 'master'

2016-12-13T18:58:23+00:00


API: Memoize the current_user so that the sudo can work properly

Closes #25482

See merge request !8017

Merge branch 'move-admin-settings-feature-to-rspec' into 'master'

2016-12-13T17:37:55+00:00


Replace the Spinach specs for admin settings with RSpec feature specs as per #23036 

Part of #23036

See merge request !8058

Merge branch 'api-simple-group-project' into 'master'

2016-12-13T16:52:42+00:00


API: Ability to get group's project in simple representation

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25412

See merge request !8060

Move admin settings spinach feature to rspec

2016-12-13T16:13:21+00:00

Make rubocop happy

2016-12-13T15:12:48+00:00