Resolve '33594-disable-autocomplete-on-snippet-comments' conflicts

See merge request !12284

This was renamed in 9.4,
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11811

Disable autocomplete on snippets comments

Closes #33594

See merge request !12108

Enable autocomplete on project snippets

Closes #33911

See merge request !12286

Adjust position and wording for related issues in merge requests

Closes #33652

See merge request !11759

Re-enable autocomplete for milestones, tags, releases, and wiki

Closes #33598

See merge request !12110

Add info about artifacts object storage in docs

See merge request !12208

If migrations are pending, make CurrentSettings use existing values and populate missing columns with defaults

See merge request !12253

Docs permissions for group labels

See merge request !12269

Reduce wait timings for Sidekiq jobs

See merge request !12270

Don't display comment on unchanged line on both sides in parallel diff

Closes #33864

See merge request !12275

Prepare 9.3 RC4

See merge request !12260

Issue board docs

See merge request !12197

Jira integ docs

See merge request !12196

Confidential issues redesign docs

See merge request !12195

Convdev docs

See merge request !12189

Update ruby metrics endpoint text to be clearer

See merge request !12157

Support a configurable Rails asset_host to allow for CDNs

See merge request !12102

Allow to access statuses for external CI services

Closes #30714, #29369, and #15220

See merge request !11176

Show private subgroups if member of parent group

Closes #32135

See merge request !11764

correct ByAuthor translation in commit box

Closes #33819

See merge request !12256

Resolve "Missing translations for the project & repository pages" conflicts

See merge request !12243

Call Capybara.reset_sessions! before block_and_wait_for_requests_complete

Closes #33779

See merge request !12224

Wait for all Ajax and Vue requests to complete in JavaScript tests

Closes #33756

See merge request !12203

Let PhantomJS load local images

See merge request !12003

Missing translations for the project & repository pages.

Closes #33420

See merge request !12052
Conflicts:
	app/assets/javascripts/locale/en/app.js
	app/assets/javascripts/locale/es/app.js
	app/views/projects/pipeline_schedules/_form.html.haml
	locale/en/gitlab.po
	locale/es/gitlab.po
	locale/gitlab.pot

Partially revert 1e8dbd46

See merge request !12236

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