CE upstream - 2018-10-29 11:21 UTC

Closes #7760

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

Don't synchronize default branch for pull mirrors

Closes #8108

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

docs: Add deprecation notice for renamed licensed feature

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

Geo: Stale docs on frequency of Geo replication

Closes #7858

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

Revert to the previous behavior for pull mirrors where the
default branch is not synchronized. Not everyone wants to
mirror the default branch of the upstream repository.

Move the remaining EE-specific JS tests to ee/spec

Closes #3871

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

Rails5: fix flaky mysql reset pipeline minutes spec

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

A route was added before the corresponding MR was
merged.  So add the placeholder so we can keep 'routes.rb' in sync with CE/EE

Geo: Handle orphaned Uploads records

Closes #5916

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

Extract EE-specific lines for issues and MR controllers

Closes #6668

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

Fix Project Security Dasbhoard

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

Show actual Milestone dates within tooltips for Milestones in Epics sidebar

Closes #7103

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

EE port of Post merge pipeline and environments status

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

# Conflicts:
#	db/schema.rb

[ci skip]

Clarify last board navigation documentation

Closes gitlab-ee#7760

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

`Create a new tag` json Missing double quotes

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

Models and migrations for group level clusters

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

Add None/Any options for assignee in search bar

Closes #52383

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

Backport CE route changes for Ops Dashboard in EE

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

Fixing count on Milestones

Closes #50848

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

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

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

Updated the Geo FAQ

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

Merge branch '52780-stale-pipeline-status-cache-for-_project-after-disabling-pipelines' into 'master'

Resolve "Stale pipeline status cache for `_project` after disabling pipelines"

Closes #52780

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

Resolve: When you add an issue to an epic that is already in the epic, you get erroneous system notes

Closes #6944

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

Resolve: When you add an issue to an epic that is already in the epic, you get erroneous system notes

Even though we currently only should have one group for a cluster, we
allow the flexibility to associate to other groups in the future.

This also matches the runner <=> groups association.

- Adds Cluster#first_group, aliased to Cluster#group. For the
conceivable future, a cluster will have at most one group.

- Prevent mixing of group and project clusters. If project type
clusters, it should only have projects assigned.  Similarly with groups.

- Default cluster_type to :project_type. As it's very small table we can
set default and null: false in one release.

Write some Geo dev docs

Closes #7685

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

CE upstream - 2018-10-28 23:21 UTC

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