Merge branch 'email_in_gravatar_urls' of gitlab.com:arnaud/gitlab-ce into email_in_gravatar_urls
AMR warning for merge requests officers.
List the next steps.
Add short path route for groups.
 Merge branch 'is-it-amr' into 'master'

Is it amr
Merge pull request #6765 from jvanbaarsen/fixed-missing-buid-option

Fixed a typo fix in the travis build
Merge pull request #6405 from awiddersheim/fix_space_in_commit_message

Fix extra space added in beginning of commit message
Merge pull request #6764 from BrettBukowski/classname-typo

Fix "project-name" span classname typo
Split feature tests out to different build job
Merge pull request #6747 from mrts/expose-event-and-mergerequest-timestamps-in-api

Expose event and mergerequest timestamps in API
Merge pull request #6766 from jvanbaarsen/split-test-even-further

Split feature tests out to different build job
Merge pull request #6699 from criteo/api_get_open_merge_requests

Add optional parameter to list merge requests
Merge pull request #6731 from hiroponz/better-title-format-for-wiki-page

Better title format for wiki page
Slack documentation added
Replace $your_email with actual email-address. Fixes #6714
Merge branch '161-emails-on-push-service' of https://gitlab.com/jsternberg/gitlab-ce into jsternberg/gitlab-ce-161-emails-on-push-service

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
Merge branch 'jsternberg/gitlab-ce-161-emails-on-push-service'
Merge pull request #6768 from omkelderman/master

Replace $your_email with actual email-address in ssh-help-page
Merge pull request #6767 from leventyalcin/master.slackdoc

Slack documentation added
Merge pull request #6763 from Razer6/sync_issue_pattern

Sync default issue closing pattern in doc and implementation