Does not rescue from GRPC::DataLoss errors

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

Geo: Fix repo, wiki, and upload replication when renaming a namespace that has subgroups, without hashed storage enabled

Closes #6012

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

EE: Display help text below auto devops domain with nip.io domain name (#45561)

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

Resolve "Interact with security reports should be marked as 'alpha' instead of 'experimental'"

Closes #6016

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

Merge branch '46361-does-not-log-failed-sign-in-attempts-when-the-database-is-in-read-only-mode-ee' into 'master'

Port of 46361-does-not-log-failed-sign-in-attempts-when-the-database-is-in-read-only-mode to EE

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

[CE port] Remove Spinach

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

Improve security dismissal documentation

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

Don't rebase if not needed in ee-specific-lines-check

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

Add forgotten IgnorableColumn in Geo::RepositoryDeletedEvent

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

Resolve "Extract EE specific files/lines for clusters related files"

Closes #5968

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

In gitlab-org/gitlab-ee!5389 the use of repository_storage_path was
removed. We ignored those columns in the geo event log tables, but for
the `geo_repository_deleted_events` table, this was forgotten.

gitlab-org/gitlab-ee!5468 is prepared to actually remove the columns
with a migration.

Remove license management docs

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

when the namespace has subgroups with projects.

Resolve "Link for interacting with security reports is wrong"

Closes #6015

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

Geo - Calculate the checksum for outdated projects with less activity first

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

This is more aligning with ce_fetch_base, which is the merge-base
between the forked branch and master.

CE upstream - 2018-05-14 18:24 UTC

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

Correct skewed Kubernetes popover illustration

Closes #46345

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

This is trying to resolve the issues found in:

https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/68097296

* Use checkout -f whenever checking out to a new branch
  (See that `?? vendor/gitaly-ruby/`? That's another thing which
  would break)
* Skip rebasing whenever `ce_merge_base` and `ce_fetch_base` are the same.

CE upstream - 2018-05-14 16:02 UTC

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

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js

[ci skip]

Move SquashBeforeMerge vue component

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

Move SquashBeforeMerge vue component

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