Added email threading for update emails on issues and merge requests (if the mail client support the References: mail header)
Now using correct ids as reference if we are informing about a new note.
Added some tests.
Draft API method for merge MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Specify error codes for merge api

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Docs for merge api

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Add some tests for merge API

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge pull request #6109 from jamit/master

Added email threading for update emails on issues and merge requests
More tests for merge api

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'api-mr-merge' into 'master'

Accept merge request API

This MR adds new endpoint `PUT /projects/:id/merge_request/:merge_request_id/merge`. After this change you can merge branches using API.

Fixes internal issue #1166
Implement Merge Request Labels
Merge pull request #6778 from dblessing/feature/mr_labels

Merge Request Labels
Improve violet theme

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'improve-violet-theme' into 'master'

Improve violet theme
Add support for Jira ticket mentions in format JIRA-123.

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

Conflicts:
	CHANGELOG-EE
Better name for config variable.
Improve file title

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Change diff header bg

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'improve-jira-linking' into 'master'

Improve jira linking

Ported from EE
Add warning to gitlab.yml related to gzip assets and relative links.