CE upstream - 2018-04-18 15:24 UTC

Closes gitaly#1115

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

EE: Fix direct_upload when records with null file_store are used

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

Fix Epic timeline bar misalignment when start date is in last timeframe month and end date is out of range

Closes #5658

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

Old records have a null value of file_store column.
This causes the problems with current direct_upload implementation,
as this makes it to choose Store::REMOTE instead of Store::LOCAL.

This change moves the store save when change saving the object.

Signed-off-by: Rémy Coutable <remy@rymai.me>

Geo: Add back job artifacts sync status to /admin/geo_nodes

Closes #5712

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

Ee 41059 calculate artifact size more efficiently

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

Previously we scheduled a worker to just some this but we were running
into performance issues when the build table was getting too large. So
now we've updated the code such that this column is updated immediately
and incremented/decremented by the correct amount whenever artifacts are
created or deleted.

We've also added the performance optimization that we do not update this
statistic if a project is deleted because it could result in many
updates for a project with many builds.

Get GITLAB_FEATURES from Project#licensed_features instead of Namespace#features (#5320)

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

EE: revert goldiloader for EE master

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

Resolve "Avoid possible infinite loops in Container Scanning"

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

CE Port: Fix Custom hooks are not triggered by UI wiki edit

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

Port Group member contribution analytics table to Vue

Closes #4949

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

This reverts the addition of the "goldiloader" Gem and all use of it.
While this Gem is very promising it's causing a variety of problems on
GitLab.com due to it eager-loading too much data in places where we
don't expect/can handle this. At least for the time being this means we
have to go back to manually fixing N+1 query problems, but at least
those should not cause a negative impact on availability.

# Conflicts:
#	app/assets/stylesheets/pages/commits.scss
#	app/views/projects/issues/_nav_btns.html.haml

[ci skip]

Fix security products examples

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

set proper signature marker in mails

Closes #43617

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

Add more detail to cleanup steps for background migrations

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

CE upstream - 2018-04-17 20:56 UTC

Closes gitaly#401 et gitlab-org/release/docs#9

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

Fix regression around new SHA widget in "New Merge Request" Screen

Closes #45446

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

EE Port of CE!18422

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

Improve web IDE commit input

Closes #44832

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