Merging conflicts for ee_compat_check in !22010

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

Move EE specific code out of the Project model

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

Base MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22010

CE upstream - 2018-10-22 21:21 UTC

Closes #4302

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

Fix GitLab version for elasticsearch

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

Disable Feature Flags and Packages if repository is disabled

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

This tests permissions when repository is disabled

EE: Support license management and performance

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

Add indexes to all geo event foreign keys

Closes #7955

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

Add note about OpenShift specific configuration

Closes #4584

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

This introduces a new syntax for all licenses and performance jobs:

```yaml
job:
  reports:
    performance: performance.json
    license_management: gl-license-management-report.json
```

Rename 'sast_container' to 'container_scanning' in GITLAB_FEATURES

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

Revert "Revert "Update code quality documentation""

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

Because the Geo Event tables do a `on_delete: :cascade`, the foreign
keys in `geo_event_log` need to have an index. Otherwise the deletion
would be very slow.

See
https://docs.gitlab.com/ee/development/migration_style_guide.html#adding-foreign-key-constraints

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

[EE-PORT] Resolve "Filter discussion (tab) by comments or activity in issues and merge requests"

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

Document setting changes that need to be in audit log

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

# Conflicts:
#	app/models/clusters/platforms/kubernetes.rb
#	app/services/projects/after_rename_service.rb
#	qa/qa/git/repository.rb

[ci skip]

CE upstream - 2018-10-22 13:22 UTC

Closes gitlab-ce#52690, #7996, gitlab-ce#52559, gitlab-ce#52728, and gitlab-qa#142

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

Revert "Merge branch 'refactor-cluster-create-service-spec' into 'master'"

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

Remove card-title in card-header

Closes #46884

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

This reverts merge request !22407

Improve validation errors for external CI/CD configuration

Closes #51369

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

EE Port for Add Clusters::KubernetesNamespace model - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22404

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

Add Clusters::KubernetesNamespace model

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

Bump mermaid to 8.0.0-rc.8

Closes #52601, #50105, and #40470

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

This reverts commit c3c22cb2.

Change branch font type in tag creation

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