Port _merge_params.html.haml conflict message

See merge request !12140

Resolve "pipeline_schedules pages throwing error 500"

Closes #32790

See merge request !11706
Conflicts:
app/models/ci/pipeline_schedule.rb
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml

Make sure reCAPTCHA configuration is loaded when spam checks are initiated

Closes #33532

See merge request !12080

Merge branch '32995-issue-contents-dynamically-replaced-with-stale-version-after-saving-or-refreshing-relative-external_url-only' into 'master'

Fix incorrect ETag cache key when relative instance URL is used

Closes #32995

See merge request !11964

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12011

Fix error thrown with missing note fragment in DOM

Closes #32888

See merge request !11700
Conflicts:
spec/javascripts/merge_request_tabs_spec.js

Invalidate cache for issue and MR counters separately

See merge request !11394

Fix filtered search issuable empty state exception

Closes #31455

See merge request !11347

Backport from EE: Fix '/unassign' slash command

See merge request !11926

Fix backup task to continue on corrupt repositories

Closes #31767

See merge request !11962

nil-check Repository::is_ancestor?

Closes #33377

See merge request !11976

Fix 9.2 conflicts for "Fix note header author and time ago wrapping in parallel diff"

See merge request !12004

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11702

Fixed issue boards not filtering when URL params are encoded

Closes #32084

See merge request !11320

Use headless Google Chrome browser in GitLab QA

Closes gitlab-qa#45 and gitlab-qa#48

See merge request !11680

Fix alignment of hover state on emoji button

Closes #32850

See merge request !11691

Remove 0 margin bottom for last paragraph on note text

See merge request !11699

Only remove FK if it exists

See merge request !11828

Fix issue realtime title/description change CSS transition

See merge request !11731

Resolve "User autocomplete per_page does not work"

Closes #32977

See merge request !11742

Fix alignment of tree symbols in merge requests

Closes #29590

See merge request !11761

Fix LFS timeouts when trying to save large files

Closes #33218

See merge request !11866

Return the last coverage in trace stream

Closes #31556

See merge request !11128

Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master'

Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form

Closes #32447 and #32907

See merge request !11558

Check only a merge ability for protected actions

Closes #32618

See merge request !11648

Fix terminals support for Kubernetes service

Closes #31754

See merge request !11653

Use #real_next_run in pipelines table

Closes #32509

See merge request !11660

Provide default for calculating label text color

Closes #32728

See merge request !11681