We'd need to keep track of project full path otherwise directory tree created with hashed storage enabled cannot be usefully imported using the import rake task.

Speed up generation of commit stats by using Rugged native methods

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

Migrate repo forking to Gitaly

Closes gitaly#825

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

Fix `rake db:seed_fu` not doing anything in CI

Closes #41517

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

Switch some bundles to use Axios

Closes #41043

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

Add i18n helpers to branch comparison view

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

Resolve "gitlab-rake gitlab:import:repos schedules an import"

Closes #41424

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

Fix method lookup

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

Multi File Editor File icons

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

Resolve "Performance bar prevent the auto-scroll-to-bottom when visiting a job's page"

Closes #41120

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

Align chart docs with readme

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

Skip projects filter on issues search

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

Gitaly conflict resolver

Closes gitaly#813

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

The previous implementation iterated across the entire patch set
to determine the number of lines added, deleted, and changed. Rugged
has a native method `Rugged::Diff#stat` that does this already,
which appears to be a little faster and require less RAM than doing
this ourselves.

Improves performance in #41524

Resolve "Modify the empty state of changes in MR"

Closes #41357

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

Remove unnecessary sidebar element realignment

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

Add break word wrapping to well-list

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

Before:
/-/boards/1/issues.json?page=1&per=50&scope=all&utf8=✓&state=opened&milestone_title=#upcoming

After:
 /-/boards/1/issues.json?page=1&per=50&scope=all&utf8=%E2%9C%93&state=opened&milestone_title=%23upcoming

Backport from
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3732

* master: (120 commits)
  Update CHANGELOG.md for 10.3.3
  Fix user membership destroy relation
  Use heredoc so it's more clear
  Put all menus under menu module
  Introduce common project settings and just put
  Introduce Factory::Resource::DeployKey
  Introduce expand_deploy_keys
  Introduce Menu::Side
  Add documents for GitLab utilities
  Clears visual token on second backspace
  Update prometheus gem to version that adds inf+ bucket in accordance with Prometheus docs.
  Add breadcrumbs to User Settings sub-views
  Rename asset sync related AWS variables
  Allow logged in user to change his password
  Fix 404 error after a user edits an issue description and solves the reCAPTCHA
  Fix links to old commits in merge requests
  Typos correction on the advise of @smcgivern
  Documenting that resolved JIRA tickets are not automatically transitioned
  Forking a project to a namespace with lower visibility.
  Keep typographic hierarchy in User Settings
  ...

The default behavior of seed_fu is to load the fixtures using the RAILS_ENV
environment.  In CI, since we set RAILS_ENV=test, nothing is ever
loaded. Instead of `rake db:seed_fu`, use `rake gitlab:setup`, which sets up
MySQL properly with limits.

Closes #41517

- Add a Gitlab::Git::Conflict::Resolution class to encapsulate
resolution data
- Simplify conflict file collection assembly