Follow the `cherry pick -x` format for the first line, and the
interactive rebase format for the commits in the merge, in case
of merge commit

This also fixes the inconsistency between non/merge commits in the number of newlines introduced.

Remove deprecated field from workhorse API responses

See merge request !13567

Fix inconsistent spacing for edit buttons on issues and merge request page

Closes #36206

See merge request !13547

Resolve "Enable scope hoisting with webpack"

Closes #36152

See merge request !13374

Allow usage of any_projects? with an Array

Closes #3646

See merge request !13559

# Conflicts:
#   app/views/projects/merge_requests/_nav_btns.html.haml

Change Confidential Message When Visible - UI Polish

See merge request !13551

Add two more project templates

See merge request !13415

Related to !13108. Mostly this is just running the rake task and
changing the task a bit to catch cases like the project already existing
or so. The rake task moves archives to the vendor/project_template
directory, which are checked in too.

In some cases we pass an Array to this method which would previously
fail since Array does not respond to "limit_value".

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3646

JIRA docs update

See merge request !13514

Handle missing .gitmodules when getting submodule urls

See merge request !13509

Display GPG status loading spinner only when Ajax request is made

Closes #35699

See merge request !13526

Remove invalid broadcast messages before migrating

See merge request !13538

Cache the number of forks of a project

See merge request !13535

Add auto-monitoring docs to auto-deploy page

Closes #36398

See merge request !13522

Fix edit merge request button inconsistent letter casing

Closes #34086

See merge request !13548

Speed up Group#user_ids_for_project_authorizations

Closes #36182

See merge request !13508

Move callout to vue file and remove svg from data function to improve performance

See merge request !13539

Docs correct filetree

Closes #36428

See merge request !13545

Update docs with Javascript accord.

See merge request !13440

Repo fixes part E

See merge request !13472

Remove newlines in translations

See merge request !13531

Fix positive raise_error expectation without specifying the error type expected…

Closes #36378

See merge request !13542