delta/gitlab/gitlab-ce.git, branch 4416-description-timestamp

Return last edited time instead of update time

2018-01-11T16:27:28+00:00

For issuable models we keep two timestamps:
updated_at which is updated whenever any model attribute is changed,
last_edited_at which is changed when only title or description is
changed.

In UI bellow description we display who and when updated the item. But
last_updated_by (used for 'who') is mistakenly combined with updated_at
(when), last_edited_at should be used instead.

Closes #41247

Merge branch 'mk-add-geo-support-for-artifacts' into 'master'

2018-01-10T20:20:47+00:00

Add Geo support for CI job artifacts

Closes #2388

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

Merge branch 'ee-41491-fix-nil-blob-name-error' into 'master'

2018-01-10T20:00:12+00:00

Fix 500 error when visiting a commit where the blobs do not exist (nil blobs) -- EE merge edition

Closes gitlab-ce#41491

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

Fix 500 when visiting a commit where blobs do not exist (nil blobs)

2018-01-10T19:05:44+00:00

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41491

Conflicts:
	app/assets/stylesheets/pages/diff.scss
	app/views/projects/diffs/_stats.html.haml

Clarify in UI that only local files are synced

2018-01-10T18:57:14+00:00

as opposed to files in an object store.

Add changelog entry

2018-01-10T18:56:07+00:00

Add job artifacts to /admin/geo_nodes

2018-01-10T18:56:07+00:00

Create JobArtifactDeletedEvent on destroy artifact

2018-01-10T18:54:19+00:00

Delete job artifact on JobArtifactDeletedEvent

2018-01-10T18:54:19+00:00

Primary supports api/transfers/job_artifact/:id

2018-01-10T18:54:19+00:00