See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5572

Merge branch '4957-projectsyncworker-should-skip-projects-that-have-a-broken-gitaly-shard' into 'master'

Resolve "ProjectSyncWorker should skip projects that have a broken Gitaly shard"

Closes #4957

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

Merge branch '4957-projectsyncworker-should-skip-projects-that-have-a-broken-gitaly-shard-3' into 'master'

Shard name vs. Shard updates, general tech debt cleanup

Closes #4957

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

Group SAML SSO Page (But not the parts to make the sign in button work)

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

Fix network error message styling on Geo admin dashboard

Closes #5806

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

Resolve "Geo: Don't block "Edit" and "Remove" buttons while status is loading"

Closes #5351

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

Ignore db/schema.rb and locale/gitlab.pot in `ee-specific-lines-check`

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

Resolve conflicts in app/models/group.rb db/schema.rb lib/api/entities.rb spec/serializers/pipeline_serializer_spec.rb

# Conflicts:
#	app/models/group.rb
#	db/schema.rb
#	lib/api/entities.rb
#	spec/serializers/pipeline_serializer_spec.rb

[ci skip]

Shared CI runners for groups

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

CE upstream - 2018-05-03 18:26 UTC

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

Resolve ""Repository mirroring paused" email link is invalid"

Closes #5740

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

SamlProvider has many linked Identities

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

Perform a limited count for the badge counts for tabs in the Users admin area

Closes #33927

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

Update grape-entity 0.6.0 -> 0.7.1

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

Break issue title for board card title and issuable header text

Closes #45940

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

Add loading icon padding for pipeline environments

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

# Conflicts:
#	LICENSE

[ci skip]

Move TimeTrackingSpentOnlyPane vue component

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

Move TimeTrackingSpentOnlyPane vue component

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

Add padding to profile description

Closes #35727

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

Added changes count to web IDE folder

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

Changes HTML version of mirror was hard failed email to use full path instead of relative path for the project

Change the docs license to CC BY-SA

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

Change the docs license to CC BY-SA

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

update omniauth-github ~> 1.1.1 to ~> 1.3

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

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

CE upstream - 2018-05-03 13:09 UTC

Closes gitaly#1146

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

This drastically reduces page load times at gitlab.com scale.