delta/gitlab/gitlab-ce.git, branch doc-setup-ssh

Merge branch 'rs-merge_commit_message' into 'master'

2016-09-27T12:55:04+00:00


Improve how MergeCommit#merge_commit_message builds the message

Now a merge request with a blank description will no longer produce a
merge commit message like this:

```
Merge branch 'foo' into 'master'

Bring the wonders of foo into the world



See merge request !7283
```

What an improvement! :tada:

See merge request !6450

Merge branch 'dz-profile-organization' into 'master'

2016-09-27T12:42:42+00:00


Add organization field to the user profile

## What does this MR do?

Add organization field to the user profile 

## Are there points in the code the reviewer needs to double check?

no

## Why was this MR needed?

So we can let users fill organization information separately

## Screenshots (if relevant)

![Screen_Shot_2016-09-26_at_7.32.27_PM](/uploads/d11a9a86aa22227f9c9915d195106c5f/Screen_Shot_2016-09-26_at_7.32.27_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [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?

https://gitlab.com/gitlab-org/gitlab-ce/issues/21903

See merge request !6526

Merge branch 'rc-new-members-approve-request-access-service' into 'master'

2016-09-27T12:10:12+00:00


New `Members::ApproveAccessRequestService`

Part of #21979.

## Does this MR meet the acceptance criteria?

- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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)

See merge request !6266

Improve how MergeCommit#merge_commit_message builds the message

2016-09-27T12:04:41+00:00

Now a merge request with a blank description will no longer produce a
merge commit message like this:

```
Merge branch 'foo' into 'master'

Bring the wonders of foo into the world

See merge request !7283
```

What an improvement! :tada:

Merge branch 'lfs-helper-doc-link' into 'master'

2016-09-27T11:48:54+00:00


Use GitLab Routing helpers for the documentation URL in `LfsHelper`

To reduce conflicts from changes introduced in gitlab-org/gitlab-ee!740

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/740#note_15782550

See merge request !6529

Add extra check for api users spec

2016-09-27T11:46:39+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch '22578-cycle-analytics-incorrect-commit-count'

2016-09-27T11:29:56+00:00

Merge branch 'fix-unsubscribe-header'

2016-09-27T11:27:59+00:00

Improvements to user organization field feature after code review

2016-09-27T11:04:39+00:00

* Add newline to user organization spec according to test guide
* Remove unnecessary comments from user organization database migration

Signed-off-by: Dmitriy Zaporozhets

Add User#organization to users api

2016-09-27T11:04:39+00:00

Signed-off-by: Dmitriy Zaporozhets