Conflicts:
   app/helpers/blob_helper.rb
   app/views/projects/blob/_header.html.haml

Fix diffs with edit-forking needs -- EE merge edition

Closes gitlab-ce#31276 and gitlab-ce#30637

See merge request !1705

Bump mysql2 gem from 0.3.16 -> 0.4.5

See merge request !1715

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ee-31276-fix-diffs-with-edit-forking-needs

Conflicts:
	app/assets/javascripts/blob/blob_fork_suggestion.js
	app/assets/javascripts/dispatcher.js
	spec/javascripts/blob/blob_fork_suggestion_spec.js

See https://gitlab.slack.com/archives/C0GQHHPGW/p1493136800695415
See https://gitlab.slack.com/archives/C41AN6LH4/p1493137591740753

Swap a before_save call with a before_create/before_update pair to avoid a confict with elasticsearch-model

Fix for spinach: \'New Project :: I should see instructions on how to import from Git URL :: When I click on "Repo by URL"\'

Use jQuery niceness on blob_fork_suggestion -- EE merge edition

See merge request !1706

Fix incorrect spec filenames which were ingored by CI

Closes #2250

See merge request !1709

Refactor deploy boards into vue files

See merge request !1694

Appears to fix some issues in Timeout: https://github.com/brianmario/mysql2/releases

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

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276

Conflicts:
	app/views/projects/blob/_header.html.haml

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30637

Added info about Admin user ability to push to protected branches.

See merge request !1009

Test both PostgreSQL and MySQL for the win

See merge request !1646

* Add Audit events link to project settings tab and make audit tests work
* Fix 404 when remove deploy key
* Fix pipelines quota specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Make handler metric params more explicit

See merge request !1696

Refactor add_users method for project and group [EE]

See merge request !1697

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

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

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

This lets us track how many incoming emails a GitLab instance is processing, by
email type (handler) and by project (where applicable).

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

Remove duplicated tests

See merge request !1687

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

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

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

Update plantuml.md Fix wrong order when restarting tomcat service [ci skip]

See merge request !10855

Fix border color on activities page

Closes #31072

See merge request !10864

Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10602#note_27871752

Conflicts:
	app/assets/javascripts/blob/blob_fork_suggestion.js
	app/assets/javascripts/dispatcher.js
	spec/javascripts/blob/blob_fork_suggestion_spec.js