[ci skip]

ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`

Closes #40291

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

(cherry picked from commit b462edfd)

Conflicts:
	lib/tasks/gitlab/cleanup.rake

FileUploader should use Hashed Storage only when project is migrated

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

(cherry picked from commit c63c41af)

d087b4da FileUploader should check for hashed_storage?(:attachments) to use disk_path

Optimize read-only middleware so that it does not consume as much CPU

Closes #40185 and gitlab-com/infrastructure#3240

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

(cherry picked from commit 6c339816)

3c52e2f0 Optimize read-only middleware so that it does not consume as much CPU
cba68d33 use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers`
91075c82 check for `read_only?` first before seeing if request is disallowed
aeb2f49f Revert "check for `read_only?` first before seeing if request is disallowed"

Opt in gitaly

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

Fix conflict highlighting

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

(cherry picked from commit 202ab628)

64a9e53b Fix conflict highlighting

Merge branch '40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use' into 'master'

Fix Gitlab::Git::Repository#remote_tags using unexisting variable

Closes #40300

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

(cherry picked from commit c563661f)

63beaa32 Fix Gitlab::Git::Repository#remote_tags using unexisting variable
d622a8c5 Merge branch 'master' into 40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use

Remove the selects when counting the last page

Closes #40266

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

(cherry picked from commit c406824d)

5a335c4d Remove the selects when counting the last page

Fix project transfer with hashed-storage attachments

Closes gitlab-ee#4056

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

(cherry picked from commit 121508f8)

9b3b0f02 Fix project transfer with hashed-storage attachments

Prepare 10.2 RC3 release

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

Use relative git object paths to construct absolute ones before setting Env

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

(cherry picked from commit 6ca24bd2)

52bfd064 Use relative git object paths to construct absolute ones before setting Env

Merge branch '40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-org-labels-json' into 'master'

Resolve "/groups/gitlab-org/labels.json redirects to /groups/gitlab-org/-/labels/.json"

Closes #40230

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

(cherry picked from commit 7142af49)

9f921b73 Don't add a trailing slash in group redirects

Fix hashed storage with project transfers to another namespace

Closes gitlab-ee#4056

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

(cherry picked from commit 76b2a7ca)

0c085aaf Fix hashed storage with project transfers to another namespace

Optimise getting the pipeline status of commits

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

(cherry picked from commit 6d36c3b5)

ab16a6fb Optimise getting the pipeline status of commits

Fix go-import meta data when enabled_git_access_protocol is a blank string

Closes #40256

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

(cherry picked from commit 69dd59ae)

f767dd4a Fix go-import meta data when enabled_git_access_protocol is a blank string

Convert migration to populate latest merge request ID into a background migration

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

(cherry picked from commit 2dff3776)

5cecff89 Convert migration to populate latest merge request ID into a background migration

Always return full avatar URL for private/internal groups/projects when asset host is set

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

(cherry picked from commit f24a78f2)

0cf25867 Always return full avatar URL for private/internal groups/projects when asset host is set
d4babd26 Remove specs that are testing behavior already tested in Avatarable unit tests

Set 0.69.0 instead of latest for codeclimate image

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

(cherry picked from commit 10c216da)

06c9327c Set 0.69.0 instead of latest for codeclimate image

Refactor  Cluster docs

Closes #39952

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

(cherry picked from commit d41e66cb)

644a2941 Add info about the installed apps in the Cluster docs
b7a01e08 Add info on creating your own k8s cluster from the cluster page
ee7ecc81 Add Ingress description from official docs
3b9773fc Change to Google Kubernetes Cluster and add internal links
bacf671a Move installation of apps higher

Cache the number of user SSH keys

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

(cherry picked from commit 66bf283d)

3e561736 Cache the number of user SSH keys

Isolate the fork network background migrations

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

(cherry picked from commit c5720382)

f961744b Isolate the fork network background migrations

Update queries to remove duplicate entries (CE version)

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

(cherry picked from commit 96764f26)

bc58f625 Adjust metrics to ignore Job tag to support k8s 1.7+
ab9acf1a Fix to use variable
41d1843f Fix CPU metric
712d5d89 Change label to be more consistent, not a series.
33fa4ef6 Uodate docs

Make sure NotesActions#noteable returns a Noteable in the update action

Closes #40208

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

(cherry picked from commit 5fbda2af)

f691010d Make sure NotesActions#noteable returns a Noteable in the update action

Adjust openid_connect_spec to use `raise_error`

Closes #40093

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

(cherry picked from commit 37cca88d)

a37427f6 Adjust openid_connect_spec to use `raise_error`

Backport delete epic changes

Closes #40162

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

(cherry picked from commit c3d8bc35)

c6c493a7 Backport delete epic changes

Add readme only default project view preference

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

(cherry picked from commit df7e00b7)

4a6ec1e0 Add readme only default project view preference

Update container repository path reference

Closes #40199

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

(cherry picked from commit e07b0bd2)

f4df4f9e Update container repository path reference
3e3c84a7 Add changelog for container repository path update

Resolve "Clicking on GPG verification badge jumps to top of the page"

Closes #40198

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

(cherry picked from commit 3ba84d4b)

d75b3380 fix issue where clicking GPG verification badge would cause page to scroll to top
4a5046c4 add CHANGELOG.md entry for !15407

Reorganize landing page for new users

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

(cherry picked from commit 6ffb9ffd)

0a7a9bbd Reorganize landing page for new users
6377821a Add mobile styles
250d606a Update new project icon
f014fce1 Add four blocks to each welcome page
5c909f2b Add new icon; update content
95ab3bf5 Use flexbox instead of bootstrap columns

Truncate tree to max 1,000 items and display notice to users

Closes #39746

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

(cherry picked from commit 69953fae)

03b1bcbb Truncate tree to max 1,000 items and display notice to users

Fix gitlab:backup rake for hashed storage based repositories

Closes #39573

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

(cherry picked from commit 43cb480a)

f4c7fea6 Fix dumping hashed storage based repository
cf6efd65 Changelog

Update gitlab-workhorse to v3.3.1

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

(cherry picked from commit 81e94ce1)

d387b0ad Update gitlab-workhorse to v3.3.1

Raise the QA Capybara's default wait time from 4 to 10

Closes gitlab-qa#103

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

(cherry picked from commit 331c807a)

b09b9b8e Raise the QA Capybara's default wait time from 4 to 10

Don't try to create fork network memberships for forks of forks

Closes #40072

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

(cherry picked from commit 3730d89f)

aaf18bb8 Don't try to create fork network memberships for forks of forks

Prevent position update for image diff notes

Closes #40058

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

(cherry picked from commit fb7abd87)

aefefbf1 Prevents position update for image diff notes