# 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

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.

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

Platform: Use component to emit event on Subscription toggle component instead of eventHub

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

This used to use two faked storages, and to work around the that fact it
disabled the wikis and just tested if methods were called. Now this
tests the effects of the method calls and enables Gitaly again.

Resolve "`include` not working"

Closes #5078

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

update devise 4.2 -> 4.4

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

[Rails5] Fix trusted proxies

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

CE port of "Remove `features/group_active_tab.feature`"

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