Resolve "Add docs for personal access tokens" conflicts

See merge request !12194

Make sure reCAPTCHA configuration is loaded when spam checks are initiated

Closes #33532

See merge request !12080

Add docs for personal access tokens

Closes #31740 and #33261

See merge request !12128

Change border color of job's scroll controllers to $border-color

Closes #33629

See merge request !12129

Update gitlab-workhorse to v2.1.1

See merge request !12049

Adds back whitespace for job's trace

Closes #33639

See merge request !12142

Fix filename method of GitlabUploader to return always real filename

Closes #33524

See merge request !12113

Let PhantomJS load local images

See merge request !12003

Set artifact working directory to be in the destination store to prevent unnecessary I/O

Closes #33274

See merge request !11905

Add an optional performance bar to view performance metrics for the current page

Closes #29010

See merge request !11439

doc: add example of scheduler when

See merge request !12067

remove outline from More Actions icon when dropdown open

Closes #33469

See merge request !12054

Refactor PostReceive worker to limit merge conflicts

See merge request !11916

Highlight jobs menu when we are in jobs page

Closes #33466

See merge request !12029

Add Bootsnap to all environments to reduce application startup time

Closes #33081

See merge request !12034

Remove nicescroll from job trace

Closes #33467 and #33427

See merge request !12028

Fall back to gzip when missing optional zopfli dependency

See merge request !12068

Raise etag route regex miss

Closes #33106

See merge request !12084

Use gitaly 0.11.2

See merge request !12092

Fix note highlight being lost after real time update

Closes #33483

See merge request !12098

Fix autocomplete not working on note edit form

Closes #33529

See merge request !12106

GitHub - Fix token interpolation when cloning wiki repository

See merge request !12107

Do not show manual actions that cannot be run

Closes #32380

See merge request !12121

Do not expose internal artifacts hash in build entity

Closes #33605

See merge request !12124

Remove js classes from vue component that are not needed in vue component

Closes #33642

See merge request !12133

Instrument MergeRequestDiff#load_commits

See merge request !12162

Don't return nil for missing objects from parser cache

See merge request !12168

Ignore CVE-2017-5029 in Nokogiri

Closes #33597

See merge request !12109

Only look up diff size limit flags once per request

See merge request !12048

Add RC2 changes to 9-3-stable

See merge request !12073