Old merge requests can have diffs without corresponding blobs. (This also may be
possible for commit diffs in corrupt repositories.)

We can't use the `&.` operator on the blobs, because the blob objects are never
nil, but `BatchLoader` instances that delegate to `Blob`. We can't use
`Object#try`, because `Blob` doesn't inherit from `Object`.

`BatchLoader` provides a `__sync` method that returns the delegated object, but
using `itself` also works because it's forwarded, and will work for
non-`BatchLoader` instances too. So the simplest solution is to just use that
with the `&.` operator.

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

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

* 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
  ...

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

Fix activity inline event line height on mobile

Closes #38778

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

Backport part of EE's "Remove EE-specific code from `POST /api/v4/projects/:id/members`"

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

Allow logged in user to change his password

Closes gitlab-ee#3482

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

Add documents for GitLab utilities

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

[ci skip]

Fix user membership destroy relation

Closes #40053

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

QA: Add a scenario for adding a deploy key

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

Ignore "lost+found" folder during backup on a volume

Closes #22672 and #17574

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

Update prometheus gem to version that publishes +Inf bucket in accordance with Prometheus docs.

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

Forking a project to a namespace with lower visibility

Closes #40022

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

everything in the scenario without a before block.

Clears visual token on second backspace

Closes #38596

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

Merge branch '39289-local-schema-rb-automatically-reverts-datetime-to-datetime_with_timezone-after-migrations' into 'master'

Prevent schema.rb reverting from datetime_with_timezone to datetime

Closes #39289

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