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

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

# 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

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

Closes gitaly#1146

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

As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/42891

As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/42891

Refactor the Geo LogCursor Logger to make class more descriptive

Closes #5632

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

Output some useful information when running the rails console

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

See https://gitlab.com/gitlab-org/gitlab-ce/issues/45970

Ensure that spec/features/issues/user_uses_slash_commands_spec tests run locally

Closes #45970

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

Fix typo in external authorization URL help text

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

# Conflicts:
#	app/models/identity.rb
#	doc/topics/autodevops/index.md

[ci skip]

CE upstream - 2018-05-02 18:27 UTC

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

To make the source class more descriptive, i.e. including all the
parent module names, the Logger used by the Geo LogCursor is
refactored to be a class. The caller should instantiate it and pass it
it's class so the logger can extract it's name.

Closes gitlab-org/gitlab-ee#5632.