If any method called by `MergeService#execute` raises a `MergeError`,
that error's message will be logged, the model will be updated, and the
merge will fail.

CE Upstream - Friday

See merge request !1306

Improve error messages when squashing fails

Closes gitlab-com/support-forum#1568

See merge request !1318

Match require statement. Status code is now undefined in master

See merge request !1314

Add MockCiService integration

See merge request !1310

Signed-off-by: Rémy Coutable <remy@rymai.me>

The `find_merge_source` method was added for CE compatibility, but 'no
source for merge' is not a useful message for users. Use the actual
message returned from the squash service in this case, and a custom
exception to save that on the model.

Signed-off-by: Rémy Coutable <remy@rymai.me>

* master:
  Fixed failing tests with ajax spinner
  API: Return 400 for all validation erros in the mebers API
  Remove repository_storage from V4 "/application/settings" settings API
  Add repository storage field back to projects API

Remove repository_storage from V4 "/application/settings" settings API

Closes #1790

See merge request !1307

Add repository storage field back to projects API

See merge request !1300

Fixed failing tests with ajax spinner

See merge request !1317

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Update manage_large_binaries_with_git_lfs.md

See merge request !9412

Query performance regression fix affecting "Dashboard::ProjectsController#index.atom"

Closes #27267

See merge request !9526

# Conflicts:
#   doc/api/v3_to_v4.md

API: Return 400 for all validation erros in the mebers API

See merge request !9523

API: Return 400 for all validation erros in the mebers API

See merge request !1311

Add Runner registration/deletion API

See merge request !9246

Bump Hashie to 3.5.5 and omniauth to 1.4.2 to eliminate warning noise

Closes #28595

See merge request !9534

Add quotes to coverage pattern

See merge request !9545

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Port of "remove-require-context-application-bundle" to EE

See merge request !1298

Adds backoff algo from EE to CE

See merge request !9517

Update Vue to v2.1

See merge request !9386

Deploy boards

Closes #1589

See merge request !1233

Add clearer placeholders and channel definition for Mattermost and Slack notifications services

See merge request !9139

[ci skip]

Closes #28595

Make Git history follow renames again by performing the --skip in Ruby

Closes #23062

See merge request !9314

MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9250/

See https://gitlab.com/madlittlemods/gl-mock-ci-service

Conflicts:
	lib/api/services.rb

Update users.md

See merge request !9475