# 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

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

Update links to external sites (Port from CE)

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

Update links to external sites

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

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

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

# Conflicts:
#	app/models/commit_status.rb

[ci skip]

Add failure reason for execution timeout

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

CE upstream - 2018-10-27 17:21 UTC

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

remove duplicate section for enabling at project level

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

remove duplicate section for enable at project level

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

CE upstream - 2018-10-26 20:21 UTC

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

Explain how to use custom setup cmd

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

# Conflicts:
#	doc/README.md
#	lib/gitlab/checks/change_access.rb

[ci skip]

CE upstream - 2018-10-26 16:28 UTC

Closes gitlab-qa#59

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