This does two things:
- Pass commit oids instead of `Gitlab::Git::Commit`s. We only need the
former.
- Depend on only the target repository for conflict listing. For
conflict resolution, treat one repository as a remote one so that we can
implement it as such in Gitaly.

CE Backport - Fix order-dependent spec failure by avoiding monkeypatching

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

removed tab indexes from tag form

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

Return the noteable in Note#touch_noteable

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

Merge branch 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master'

Refactor member view by using presenter

Closes #28004

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

Fix entrypoint overriding documentation

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

This allows EE to re-use the object, making it easier to trigger
indexing of the noteable.

Handle domain sessions better in QA scenarios

Closes gitlab-qa#102

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

Clean up new dropdown styles

Closes #39142 and #39446

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

Remove unnecessary js-issuable-edit

Closes #41042

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

Use memoization for commits on diffs

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

check the import_status field before doing SQL operations to check the import url

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

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

Hide issues and MRs in labels list if disabled

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

Move Repository#write_ref to Git::Repository#write_ref

Closes gitaly#793

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

Treat empty markdown and html strings as valid cached text, not missing cache…

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

The Gitaly CommitService is being hammered by n + 1 calls, mostly when
finding commits. This leads to this gRPC being turned of on production:
https://gitlab.com/gitlab-org/gitaly/issues/514#note_48991378

Hunting down where it came from, most of them were due to
MergeRequest#show. To prove this, I set a script to request the
MergeRequest#show page 50 times. The GDK was being scraped by
Prometheus, where we have metrics on controller#action and their Gitaly
calls performed. On both occations I've restarted the full GDK so all
caches had to be rebuild.

Current master, 806a68a8, needed 435 requests
After this commit, 154 requests

Use Single list for multiple clusters

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

Backport a spec fix done in EE (5dbecb8e) to CE

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

Treat empty markdown and html strings as valid cached text, not missing cache that needs to be updated

Use message body for merge request description

Closes #40968

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

Merge branch '41041-undefined-method-new_project_guidelines_html-unable-to-load-from-cache' into 'master'

Resolve "undefined method `new_project_guidelines_html', unable to load from cache"

Closes #41041

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

Clears the current Appearance cache otherwise it breaks since new_project_guidelines_html would be missing

Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/41041.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Add js prefix for issuable-edit

Closes #40965

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

Stop "ERROR: TypeError{}" from being logged to the console and fail tests

Closes #37619

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

Updated image for diff navigation docs

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

Use app host instead of asset host when rendering image blob or diff

Closes #41002

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

Merge branch '41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-build' into 'master'

Job dropping by MissingDependenciesError should consider StaleObjectError

Closes #41023

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

Checks for null in job tooltip title

Closes #40997

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