Merge branch '10-4-stable-prepare-rc7' of gitlab.com:gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7

Fix JS bundle not running on the Cluster update/destroy pages -- CE backport

Closes gitlab-ee#4378

See merge request gitlab-org/gitlab-ce!16506

Merge branch '10-4-stable-prepare-rc7' of https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7

Resolve "Wiki uploaded files are missing"

Closes #42031

See merge request gitlab-org/gitlab-ce!16499

(cherry picked from commit 79b05cdd)

31e59219 Fix links to uploaded files on wiki pages

Merge branch '10-4-stable-prepare-rc7' of https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7

Resolve "Icons on forks page are to big"

Closes #42046

See merge request gitlab-org/gitlab-ce!16474

(cherry picked from commit 78ca7d97)

d76047a1 fix fork icon size and button icon color on Forks page
3ec647ed Update 42046-fork-icon.yml

Fixed merge request status badge not updating after merging

See merge request gitlab-org/gitlab-ce!16470

Resolve "N+1 queries with /projects/:project_id/builds API endpoint"

Closes #41957

See merge request gitlab-org/gitlab-ce!16445

(cherry picked from commit 191b5153)

7e084984 Add n plus one spec for v3 builds api
c9a1a155 Fix N+1 in v3 builds API
c9840842 Eager load user, runner, pipeline and its creator
09118796 Add N+1 query spec for Jobs API
87cc0373 Fix N+1 builds query in Jobs list API
a4d7f155 Extend N+1 Builds and Jobs API specs
8cef1f4c Add missing newline in Jobs API spec
feb34497 Use preload instead of includes to avoid joins

Port the SAST DAST doc examples from EE to CE

Closes #42007

See merge request gitlab-org/gitlab-ce!16430

Prevent RevList failing on non utf8 paths

Closes #41627

See merge request gitlab-org/gitlab-ce!16440

(cherry picked from commit 3228ac06)

c4dd7b82 Prevent RevList failing on non utf8 paths

Set target_branch to the ref branch when creating MR from issue

Closes #41727

See merge request gitlab-org/gitlab-ce!16422

(cherry picked from commit b4bc9bd5)

7e9484e9 Set target_branch to the ref branch when creating MR from issue

Resolve "Closed issue label in todo's styling is difficult to read"

Closes #41874

See merge request gitlab-org/gitlab-ce!16414

Remove warning noise in ProjectImportOptions

See merge request gitlab-org/gitlab-ce!16410

(cherry picked from commit b384d478)

f4319f6a Remove warning noise in ProjectImportOptions

Fix Route validation when conflicting permanent redirects exist

Closes gitlab-com/support-forum#2883 and #41786

See merge request gitlab-org/gitlab-ce!16397

(cherry picked from commit d607f16f)

1dc30595 Revert "Revert "Fix Route validation for unchanged path""
c517788e Fix Rubocop offense
601c24d5 Add RedirectRoute factory
d4c8d1b7 Add changelog entry

Resolve "Managed Prometheus deployment installs a lot of extra stuff"

Closes #41799

See merge request gitlab-org/gitlab-ce!16378

(cherry picked from commit 5c51cbca)

37d96e7d Use ConfigMap content to populate values.yaml
0a69f490 Fixes suggestions on MR

Merge branch '10-4-stable-prepare-rc7' of https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7

Merge branch '41809-auto-devops-performance-docker-image-not-compatible-with-gitlab-runner' into 'master'

Include updated AutoDevOps template with Browser Performance using DinD

Closes #41809

See merge request gitlab-org/gitlab-ce!16373

(cherry picked from commit ff252f61)

9d7e0e49 Update AutoDevOps template with browser performance fix

Resolve "Wording fixes on cluster page"

Closes #41797

See merge request gitlab-org/gitlab-ce!16324

Backport authorized_keys

Closes gitlab-ee#3953

See merge request gitlab-org/gitlab-ce!16014

(cherry picked from commit 2e4a1b3b)

ac86b204 Backport authorized_keys branch 'find-key-by-fingerprint'
255a0f85 Backport option to disable writing to `authorized_keys` file
07bd79cd Combine ssh docs and rename the doc
bcffeade Use ApplicationSetting.current in Admin::ApplicationSettingsController
797fe0a6 Backport authorized_keys_enabled defaults to true'
d2f4e8f9 Avoid adding index if already exists
01319e59 Make Gitlab::CurrentSettings available when getting settings
d9557e43 Backport spec fixes in spec/lib/gitlab/shell_spec.rb
40e3d9f3 Fix typo in spec/requests/api/internal_spec.rb
bd9ead68 Fix spec in shell_spec.rb
9edd9a5e Adds changelog for backport of authorized_keys DB lookup from EE

10-4-stable with rc5 and rc6 from dev

See merge request gitlab-org/gitlab-ce!16508

10.4.0-rc6 on rc5 sec release

See merge request gitlab/gitlabhq!2310

[API] Fix creating issue when assignee_id is empty

See merge request gitlab-org/gitlab-ce!16458

Resolve "Fix type is started key"

Closes #41937

See merge request gitlab-org/gitlab-ce!16407

Fixing request json mime type

Closes #41598

See merge request gitlab-org/gitlab-ce!16427

Resolve "Empty state for manual job - play button does not work"

Closes #41970

See merge request gitlab-org/gitlab-ce!16426

Fixed performance of projects dropdown

Closes #41939

See merge request gitlab-org/gitlab-ce!16425

Use simple Next/Prev paging for CI Jobs page

Closes #41058

See merge request gitlab-org/gitlab-ce!16392

Resolve "Incorrect default merge request title when Jira activated"

Closes #36669

See merge request gitlab-org/gitlab-ce!16356

Resolve "Attachments in e-mail notifications are using the wrong URL"

Closes #41882

See merge request gitlab-org/gitlab-ce!16364

Remove Beta notice for Clusters

See merge request gitlab-org/gitlab-ce!16350

Added LFS badge to merge request files tracked by LFS

Closes #41829

See merge request gitlab-org/gitlab-ce!16345

[CE] Security Release 10.4 (rebased)

See merge request gitlab/gitlabhq!2304

Restore sidebar collapse button padding #41803

See merge request gitlab-org/gitlab-ce!16323

Use 0.69 version of codeclimate image for CI  code quality docs

See merge request gitlab-org/gitlab-ce!16319