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

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

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

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

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

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

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

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

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

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

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

ProtectedBranch API includes user_id/group_id in access levels

Closes #4152

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

Fixed import of render mermaid & render math methods

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

Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateService

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

Simplify the DB changes checklist

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

EE: Move identical merged branch check to merged_branch_names

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

Move identical merged branch check to merged_branch_names

Closes #39887

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

Added Rubocop config for background migrations

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

Use foreign key to get latest MR diff

Closes #37631

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

EE port of fix-mermaid-import

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

Clarify firewall test and fix postgresql test command

Closes #4150

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

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/4152

Fix link text from group context

Closes gitlab-ee#4100

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

Allow password authentication to be disabled entirely

Closes #37320

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

[EE] Allow password authentication to be disabled entirely

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

This removes some somewhat redundant checkboxes from the template and
rephrases the introduction now that those settings are in GDK.

[ci skip]

Update example configuration to use HA roles for Redis and sentinel

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

This adds a Rubocop configuration file specific to
lib/gitlab/background_migrations. This configuration will be used to
(hopefully) make reviewing background migrations easier by enforcing
stricter rules compared to the rest of GitLab. Because this
configuration is directory specific it will only affect background
migrations.

Remove cluster_id from 20171013104327_migrate_gcp_clusters_to_new_clusters_architectures

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

Cross link default branch docs to issue closing pattern docs

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

Cross link default branch docs to issue closing pattern docs

Closes #40449

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

Fix the redirect location wording

Closes gitlab-com/gitlab-docs#142

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

Fix the redirect location wording

Closes gitlab-com/gitlab-docs#142

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

Compared to the merge_request_diff association:

1. It's simpler to query. The query uses a foreign key to the
   merge_request_diffs table, so no ordering is necessary.
2. It's faster for preloading. The merge_request_diff association has to load
   every diff for the MRs in the set, then discard all but the most recent for
   each. This association means that Rails can just query for N diffs from N
   MRs.
3. It's more complicated to update. This is a bidirectional foreign key, so we
   need to update two tables when adding a diff record. This also means we need
   to handle this as a special case when importing a GitLab project.

There is some juggling with this association in the merge request model:

* `MergeRequest#latest_merge_request_diff` is _always_ the latest diff.
* `MergeRequest#merge_request_diff` reuses
  `MergeRequest#latest_merge_request_diff` unless:
    * Arguments are passed. These are typically to force-reload the association.
    * It doesn't exist. That means we might be trying to implicitly create a
      diff. This only seems to happen in specs.
    * The association is already loaded. This is important for the reasons
      explained in the comment, which I'll reiterate here: if we a) load a
      non-latest diff, then b) get its `merge_request`, then c) get that MR's
      `merge_request_diff`, we should get the diff we loaded in c), even though
      that's not the latest diff.

Basically, `MergeRequest#merge_request_diff` is the latest diff in most cases,
but not quite all.

Updated all Vue libraries

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

Port of 32098-environments-reusable

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