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

Fix up Web IDE user preference copy and buttons

Closes #41789

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

Fix hooks not being set up properly for bare import Rake task

Closes #41739

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

Resolve "Document rsync as requirement for 10.4"

Closes #41607

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

Fix 500 error when visiting a commit where the blobs do not exist (nil blobs)

Closes #41491

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

[10.3] Prevent login with disabled OAuth providers

See merge request gitlab/gitlabhq!2296

(cherry picked from commit 4936650427ffc88e6ee927aedbb2c724d24b094c)

a0f9d222 Prevents login with disabled OAuth providers

Port of [10.2] Sanitizes IPython notebook output

See merge request gitlab/gitlabhq!2285

(cherry picked from commit 1c46e031c70706450a8e0ae730f4c323b72f9e4c)

aac035fe Port of [10.2] Sanitizes IPython notebook output

[10.3] Fix RCE via project import mechanism

See merge request gitlab/gitlabhq!2294

(cherry picked from commit dcfec507d6f9ee119d65a832393e7c593af1d3b2)

86d75812 Fix RCE via project import mechanism

Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-queue-through-web-hook' into 'security-10-3'

Don't allow line breaks on HTTP headers

See merge request gitlab/gitlabhq!2277

(cherry picked from commit 7fc0a6fc096768a5604d6dd24d7d952e53300c82)

073b8f9c Don't allow line breaks on HTTP headers

[10.3] Migrate `can_push` column from `keys` to `deploy_keys_project`

See merge request gitlab/gitlabhq!2276

check project access on MR create

See merge request gitlab/gitlabhq!2273

(cherry picked from commit 1fe2325d6ef2bced4c5e97b57691c894f38b2834)

43e85f49 check project access on MR create

[10.3] Fix path traversal in gitlab-ci.yml cache:key

See merge request gitlab/gitlabhq!2270

(cherry picked from commit c32d0c6807dfd41d7838a35742e6d0986871b389)

df29094a Fix path traversal in gitlab-ci.yml cache:key

Validate project path in Gitlab import - 10.3 port

See merge request gitlab/gitlabhq!2268

(cherry picked from commit 94c82376d66fc80d46dd2d5eeb5bade408ec6a7e)

2b94a7c2 Validate project path in Gitlab import

Remove order param from the MilestoneFinder

See merge request gitlab/gitlabhq!2259

(cherry picked from commit 14408042e78f2ebc2644f956621b461dbfa3d36d)

155881e7 Remove order param from the MilestoneFinder

[10.3] Fix XSS in issue label dropdown

See merge request gitlab/gitlabhq!2253

(cherry picked from commit 363ffabcebd7bb0d1a2d59ca1a75e4eadb4a4360)

ea1fb0ea Fix XSS in issue label dropdown