There were two problems here:

1. On the JS side, the reference to $widgetBody didn't refer to the
   right DOM element any more. This might be because it was replaced by
   the `getMergeStatus` method. Even if it wasn't, ensuring we have the
   right element means that the content gets updated.

2. On the Ruby side, the `log_merge_error` method didn't update the
   `merge_error` column of the merge request. Change that to update if
   requested, and update in the most common cases by default.

   Additionally, this would sometimes return an error hash, but it
   doesn't look like this was ever used (the return value of
   `MergeService#execute` appears to be unused everywhere).

Rename builds to jobs in docs

See merge request !1240

[ci skip]

Merge branch 'approvals-spec-fix-for-816' into '8-16-stable-ee'

See merge request !1238

Fix approvals spec for 8-16-stable

See merge request !1231

[ci skip]

[ci skip]

[ci skip]

[ci skip]

[ci skip]

[ci skip]

Move RepositoryUpdateRemoteMirrorWorker jobs to project_mirror Sidekiq queue

See merge request !1234

We moved RepositoryUpdateMirrorWorker to the project_mirror queue in
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/900

RepositoryUpdateMirrorWorker should also exist in the project_mirror
queue and retry should be false.

Port of "API: Consolidate /projects endpoint" to EE

See merge request !1232

It consolidates these endpoints:
 - /projects
 - /projects/owned
 - /projects/visible
 - /projects/starred
 - /projects/all

Into the /projects endpoint using query parameters.

Backport "Move /projects/fork/:id to /projects/:id/fork"

See merge request !1228

Fix missing file extension for CHANGELOG entry

See merge request !1229

EE: Enable Style/RedundantException, Lint/EmptyWhen, and RSpec/ExpectActual cops

See merge request !1227

Backport "Remove deprecated templates endpoints in V4"

See merge request !1214

[EE] Resolve "GroupsController#activity.json is REALLY slow due to SQL"

See merge request !1226

CE upstream

Closes gitlab-com/gitlab-docs#68 and #1051

See merge request !1225

This is a little too picky, even for us.

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

Also, don't use limit in subquery, MySQL don't like that.
Signed-off-by: Rémy Coutable <remy@rymai.me>

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

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

# Conflicts:
#   app/models/repository.rb

[EE] Update Rubocop to Ruby 2.3

See merge request !1195

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

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

CE Upstream - Friday

Closes gitlab-ce#27955

See merge request !1218

Add member: Always return 409 when a member exists

See merge request !1215

Updated issue boards docs

Closes #27872

See merge request !9097