CE upstream - 2018-05-22 09:40 UTC

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

Rename merge request widget author component

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

Resolve "Approvers API does not work properly with form-encoded input"

Closes #6096

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

# Conflicts:
#	config/webpack.config.js

[ci skip]

Reorder LinkToMemberAvatar vue component props values

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

Fix `expose_url` helper does not include custom base url if it is set

Closes #46459

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

CE upstream - 2018-05-21 15:29 UTC

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

Resolve "Upgrade vue-loader for bug fixes and a simpler webpack config"

Closes #45532

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

Port "Upgrade vue-loader for bug fixes and a simpler webpack config" to EE

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

When last Geo::EventLog is not available, geo:status rake task fails

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

Prevent access to Group SAML metadata/SLO endpoints

Closes #5900

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

Renamed 'Overview' to 'Project' in collapsed contextual navigation at a project level

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

[ci skip]

[ci skip]

[ci skip]

# Conflicts:
#	locale/gitlab.pot

[ci skip]

Backport from EE: Adding Progressbar explicitly and spec extensions for it

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

Resolve "Geo: Rake task to force housekeeping on next sync"

Closes #5928

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

add milestone planning to process doc

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

Resolve "Registry page text is wrong and contains broken links."

Closes #45746

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

CE upstream - 2018-05-21 12:28 UTC

Closes gitlab-qa#247

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

Append trace chunk only if job is running

Closes #46383

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

Resolve "Repeated calls to Redis for Flipper feature flag"

Closes #45528

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

These have not been tested with the unique requirements of per-group SAML
and have not yet been verified for security

In particular, these will likely allow someone to determine
if a group exists or not by guessing the name.

Do not allow to use `CI_PIPELINE_ID` in environment name

Closes #46443

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

Add timezone information to the datetime select labels

Closes #23389

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

Resolve "Runner#contacted_at is not always a Time type"

Closes #46082

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

# Conflicts:
#	spec/javascripts/environments/environments_app_spec.js

[ci skip]