[ci skip]

Fix file disclosure via hidden symlinks using the project import (9.2)

See merge request !2163

Ensure user and hostnames begin with an alnum character in UrlBlocker

See merge request !2150

Add libre2-dev to the list of dependencies

Closes #35342

See merge request !12996

[ci skip]

Fix an infinite loop in Gitlab:UntrustedRegexp

See merge request !2146

[ci skip]

Fix filename used for CHANGELOG entry

See merge request !2140

Escape the underscore char inside the LIKE operator

See merge request !2117

(security-9-2) Remove the `appearance` symlink that was previously missed

See merge request !2125

[9.2 security fix] Renders 404 if given project is not readable by the user on Todos dashboard

See merge request !2119

Use re2 for user-supplied regexps

See merge request !2029

[9.2] Improve support for external issue references

See merge request !2130

[ci skip]

Fix omniauth-google-oauth2 dependencies in Gemfile.lock

Closes #32653

See merge request !11787

Fix milestone page assignees when dropped in ongoing list

Closes #32861

See merge request !12076

Re-instate is_admin flag in users API is current user is an admin

Closes #33260

See merge request !12211

[ci skip]

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