CE upstream - 2018-04-05 12:27 UTC

Closes #4474

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

add PostgreSQL 10 to Geo CI build

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

Groups reports in MR view and splits reports in CI view

Closes #4310, #5105, #4464, and #5129

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

[EE] Don't run RuboCop nor ESLint checks in the codequality job as this is already…

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

Conflicts from (CE) https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18183
to (EE) https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5031

Merge branch 'ee-43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries' into 'master'

Fix N+1 in MergeRequestParser

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

(EE-Port) Override params during import

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

Port of use-chronic-duration-attribute-for-project-build-timeout

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

This includes the classification label

read_project can be prevented by a very expensive condition, which we want to
avoid, while still not writing manual SQL queries. read_project_for_iids is used
by read_issue_iid and read_merge_request_iid to satisfy both of those
constraints, and allow the declarative policy runner to use its normal caching
strategy.

[EE] fix label and issuable referencing in epics

Closes #5390

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

# Conflicts:
#	db/schema.rb
#	doc/administration/index.md
#	doc/user/admin_area/settings/email.md
#	spec/mailers/previews/notify_preview.rb

[ci skip]

JaCoCo example

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

Reschedule pipeline stages migration to run it again

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

* `~label` references are replaced with links to epics with this label
* cross-reference system note is created when an issuable is
referenced in a epic note (or when an issuable references an epic)

Related to #5390

Web IDE markdown preview

Closes #44843

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

Allow to store uploads by default on Object Storage

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

Ensure internal users (ghost, support bot) get assigned a namespace

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

Geo: Respect retry_at when downloading artifacts

Closes #5560

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

CE upstream - 2018-04-05 09:32 UTC

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

Resolve "Coverage information for this repo is wrong"

Closes #44710

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

Add custom additional text to emails -- CE backport

Closes gitlab-ee#4474

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

Add custom additional text to emails

Closes #4474

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

Update Geo nodes layout for better usability

Closes #5146

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

New Crowdin translations

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

# Conflicts:
#	.gitlab-ci.yml
#	app/assets/javascripts/boards/services/board_service.js
#	app/helpers/services_helper.rb

[ci skip]

Changed IDE sidebar min width

Closes #44836

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