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

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

Add docs on PgBouncer exporter

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

Resolve "Extract EE specific files/lines for some merge requests files"

Closes #6127

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

# Conflicts:
#	doc/api/issues.md
#	doc/api/merge_requests.md

[ci skip]

Rename code quality job and artifact.

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

Remove dead link from University

Closes gitlab-com/people-ops/Training#21

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

Docs: Updated documentation as per latest missing features on about.gitlab.com

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

Rename code quality job and artifact

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

This way we don't have to duplicate the guard

Fix backup creation and restore for specific Rake tasks

Closes #40617

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

Updated documentation as per latest missing features on about.gitlab.com

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

Make Geo::PruneEventLogWorker delete rows more gently

Closes #6140

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

Approvals docs update to add `count`

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

Merge branch '46723-api-created-issue-do-not-get-assigned-to-specified-milestone-docs' into 'master'

Resolve "API created issue do not get assigned to specified milestone"

Closes #46723

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

Merge branch 'ee-46723-api-created-issue-do-not-get-assigned-to-specified-milestone-docs' into 'master'

EE: Clarify milestone_id scope for API operations on Issuables

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

Rename container scanning job and artifact

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

add info about the current format of the backup name and refresh examples of commands

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

Add `Access-Control-Allow-Headers` to Webpack Dev Server config

Closes #46741

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

Updated documentation as per latest missing features on about.gitlab.com

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

[CE] Backport helpers from GroupSAML failure messages

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

Display Group SAML failures in flash

Closes #5898

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

CE upstream - 2018-05-24 09:42 UTC

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

Rename container scanning job and artifact

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

Instead of attempting to delete all rows in a single SQL query, do it
in batches.

Closes gitlab-org/gitlab-ee#6140.