# Conflicts:
#	.gitlab-ci.yml
#	doc/development/testing_guide/ci.md

[ci skip]

Remove Spinach

Closes #23036

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

[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

Backport Cluster related EE code

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

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

Closes #5968

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

Disable RBAC on Ingress by default

Closes #46286

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

Update wiki page deletion confirmation

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

Enable update_(build|pipeline) for maintainers

Closes #45905

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

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.

Fix link to MR for Maintainer Access docs

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

Fix minor typo of main docs page

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

Remove license management docs

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

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

It was changed to be true on https://github.com/kubernetes/charts/commit/c60086ec0b260996281d337d67f2361f826f7029

Closes #46286