# Conflicts:
#	.gitlab-ci.yml
#	app/assets/javascripts/dispatcher.js
#	app/views/search/_category.html.haml
#	features/support/db_cleaner.rb
#	lib/gitlab/git/repository.rb
#	spec/services/issues/move_service_spec.rb
#	spec/support/db_cleaner.rb

[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

Resolve ""Revert this merge request" modal has confusing string"

Closes #39917

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

Add formatted_data attribute to Git::WikiPage

Closes #39805

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

CE upstream - Wednesday

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

Use limit for search count queries

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

[EE] Use limit for search count queries

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

Related to #39805

Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'

Closes #30783

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

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

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

Migrate .batch_lfs_pointers to Gitaly

Closes gitaly#921

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

Execute system hooks after-commit when executing project hooks

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

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

Closes gitaly#921

Fix Epic issue item reordering to handle different scenarios

Closes #4627

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

Changes the text in the Revert merge request modal: `Start a new merge request with these changes` => `Start a new merge request with the revert changes`.

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

Closes #42361

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

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

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

Remove one Spinach job and add one RSpec job

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

Migrate repository bundling to Gitaly

Closes gitaly#929

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

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

Resolve "Reuse primary host key on secondaries"

Closes #4398

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

Fix typo in `.gitlab-ci.yml` heading

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

Return more consistent values for merge_status on V4 MR APIs

Closes #20639

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

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