# Conflicts:
#	app/models/project.rb
#	app/presenters/ci/pipeline_presenter.rb
#	app/views/projects/pipelines/_with_tabs.html.haml

[ci skip]

Raise InvalidRepository error for non-valid git repositories

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

Add missing parens to make consistent in project_spec and runner_spec

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

Resolve "Geo: Gitlab::Git::CommandError (13:exit status 128) when calculating checksums"

Closes #5750

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

CE upstream - 2018-05-08 00:16 UTC

Closes #5904, #5573, and #5857

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

There are two issues:

1. When a Wiki was disabled, the spec was still trying to create a
Wiki page, which would cause Gitaly to create the repository and fire
hooks. Since Rails isn't running an internal API server, this fails.

2. For private Wikis, the Wiki repository needs to be created with the
:wiki_repo trait in order to clear hooks to prevent Gitaly from
contacting the internal API server.

Update asset_sync ~> 2.2.0 to ~> 2.4

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

Cleanly handle plural name for ghost user migration

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

Merge branch '5926-getting-geo-secondary-database-is-not-configured-when-only-running-ee-sha_attribute' into 'master'

Getting "Geo secondary database is not configured" when only running EE (sha_attribute)

Closes #5926

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

Add database foreign key between pipelines and builds

Closes #46035

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

Squash migrations from 2013

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

Squash migrations from 2013

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

Resolve "Remove remaining grey buttons"

Closes #44319

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

Removes RemoteMirror related TODO from project_spec

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

Add missing security process link for developers

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

Add migration page for Gemnasium

Closes #5917

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

Fix modal width of shortcuts help page

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

Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>

Fixed tooltip & spacing of merge request icon in IDE

Closes #46121 and #46123

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

Resolve "ee-files-location-check "git status not clean" - it didn't ignore knapsack"

Closes #5912

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

Resolve "ee-specific-lines-check should take the old base one commit before the one we want"

Closes #5923

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