delta/gitlab/gitlab-ce.git, branch 22884-setup-git-documentation-article

Added configure Git documentation article

2016-10-04T11:46:17+00:00

Merge branch 'zj-grape-keys' into 'master'

2016-10-03T10:57:52+00:00


GrapeDSL for Keys endpoint

No changelog item as it doesn't change behaviour
Cherry-picket from !6330

See merge request !6631

Merge branch 'update-gitlab-shell-3-6-3' into 'master'

2016-10-03T10:46:05+00:00


Update GITLAB_SHELL_VERSION to 3.6.3

Because VERSION at the gitlab-shell v3.6.2 tag was still 3.6.1: https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.2/VERSION (my bad!)

VERSION at the v3.6.3 tag is now 3.6.3: https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.3/VERSION

See merge request !6621

Merge branch 'fix-sidebar' into 'master'

2016-10-03T10:23:22+00:00


Fix broken left sidebar navigation

Sidebar navigation is broken and it's introduced in !6627. Sidebar pin and hamburger icons were `a` tag before with `#` link on them. That was the main reason why page jumps to top. !6627 was trying to prevent default action but it interferes with the navigation links. I don't want to tweak event listeners for sidebar, instead I just replaced `a` elements with `div` because I think there is no point to have them as `a`.

/cc @dzaporozhets @jschatz1 

PS: This MR basically reverts !6627. I don't want to add another revert commit instead I reverted it in my editor and committed.

See merge request !6648

Merge branch '21225-wip-slash-command-for-mrs' into 'master'

2016-10-03T10:19:36+00:00


Add a /wip slash command to toggle the 'WIP' prefix in the MR title

## Why was this MR needed?

As explained in #21225, it prevents you from having to click through the entire edit form just to mark an MR as WIP.

Closes #21225

See merge request !6259

Fixes sidebar navigation.

2016-10-03T09:38:21+00:00

Update gitlab-shell to 3.6.3

2016-10-03T08:49:53+00:00

Signed-off-by: Rémy Coutable

Merge branch 'fix-broken-access_requests_finder_spec' into 'master'

2016-10-03T08:48:47+00:00


Fix broken specs after merging !6265

See merge request !6647

Members::RequestAccessService is tricter on permissions

2016-10-03T08:06:40+00:00

Fortunately, only specs needed to be fixed, so that's good!

Signed-off-by: Rémy Coutable

Merge branch '22851-keep-scroll-location-when-collapsing-sidebar' into 'master'

2016-10-03T07:57:55+00:00


Fix page scrolling to top on sidebar toggle

## What does this MR do?

Prevents page from scrolling to the top when a user clicks sidebar closing hamburger icon as well as when a user is toggling sidebar pinning.

## Why was this MR needed?

When a user is closing the sidebar or pinning the sidebar the scroll position of the page should not be affected.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
Closes #22851

See merge request !6627