(cherry picked from commit 9296d473)

(cherry picked from commit 02968711)

(cherry picked from commit d7f81b7e)

(cherry picked from commit 1659071c2b2f25168ebc79128290c3eac9421ac8)

(cherry picked from commit 686198d377a6714cbc825e0df44ca00623b0a17f)

When listing issues and merge requests on dasboard page,
make sure that at least one filter is enabled.

User's id is used in search autocomplete widget instead
of username, which allows presetting user in filter dropdowns.

Related to #43246

(cherry picked from commit 37193ac0da0e5e33080d6af6e41d8896854ee37e)

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

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

Merge security fixes to master

See merge request gitlab/gitlabhq!2369

Export and import LFS objects

Closes #40643

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

Move ListCommitsByOid to OPT_OUT

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

CE upstream - 2018-04-05 05:20 UTC

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

This makes accessing LFS Objects for a project easier

  project.lfs_storage_project.lfs_objects`

becomes

  project.all_lfs_objects

This will make the refactor in
https://gitlab.com/gitlab-org/gitlab-ce/issues/39769 easier to deal
with.

Downloading the stream directly to the archive. In order to avoid
conflicts with the cache.

If the LFS object already exist, we'll link it tot he existing one, if
not we'll create it.

The LFS files will be included in the `lfs-objects` directory in the archive.

Fix 404 in group boards when moving issue between lists

Closes #44551

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

EE-PORT Fix 404 in group boards when moving issue between lists

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

Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474