# Conflicts:
#	spec/finders/issues_finder_spec.rb
#	spec/finders/merge_requests_finder_spec.rb

Resolve "Spec failure in ./spec/features/issues/spam_issues_spec.rb"

Closes #42361

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

[ci skip]

[ci skip]

updating geo docs to show Geo HA as GA in 10.4

See merge request gitlab-org/gitlab-ee!4237

Add details on how to disable GitLab to the DR documentation

Closes #4417

See merge request gitlab-org/gitlab-ee!4239

CE upstream - Wednesday

See merge request gitlab-org/gitlab-ee!4225

[EE] Use limit for search count queries

See merge request gitlab-org/gitlab-ee!4158

[EE] Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'

See merge request gitlab-org/gitlab-ee!4125

Execute group hooks after-commit when moving an issue

Closes gitlab-ce#42294

See merge request gitlab-org/gitlab-ee!4229

This commit also adds numerous small improvements to spelling and grammar

Fix incorrect OPENSSH_EXPECTED_COMMAND on gitlab:geo:check task

See merge request gitlab-org/gitlab-ee!4236

Fix Epic issue item reordering to handle different scenarios

Closes #4627

See merge request gitlab-org/gitlab-ee!4142

[EE] Remove one Spinach job and add one RSpec job

See merge request gitlab-org/gitlab-ee!4232

Resolve "Reuse primary host key on secondaries"

Closes #4398

See merge request gitlab-org/gitlab-ee!4198

Signed-off-by: Rémy Coutable <remy@rymai.me>

Search query is especially slow if a user searches a generic string
which matches many records, in such case search can take tens of
seconds or time out. To speed up the search query, we search only for
first 1000 records, if there is >1000 matching records we just display
"1000+" instead of precise total count supposing that with such amount
the exact count is not so important for the user.

Because for issues even limited search was not fast enough, 2-phase
approach is used for issues: first we use simpler/faster query to get
all public issues, if this exceeds the limit, we just return the limit.
If the amount of matching results is lower than limit, we re-run more
complex search query (which includes also confidential issues).
Re-running the complex query should be fast enough in such case because the
amount of matching issues is lower than limit.

Because exact total_count is now limited, this patch also switches to
to "prev/next" pagination.

Related #40540

EE port of groups-webpack-bundle

See merge request gitlab-org/gitlab-ee!4224

Use restore() instead of reset() for removing axios MockAdapter

See merge request gitlab-org/gitlab-ee!4217

Geo: sync .gitattributes to info/attributes in secondary nodes

Closes #4101

See merge request gitlab-org/gitlab-ee!4159

Scrap the deploy key title and match it in test

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

Resolve "Cannot copy/paste on iOS"

Closes #32546

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

CE upstream - Wednesday

Closes gitlab-runner#2652

See merge request gitlab-org/gitlab-ee!4220