summaryrefslogtreecommitdiff
path: root/ee
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix/sm/atomic-migration' into 'master'Kamil Trzciński2018-02-281-26/+77
| | | | | | | | Fix migrate! method (Minimal fix with ExclusiveLock to prevent race conditions) Closes #4928 and #4980 See merge request gitlab-org/gitlab-ee!4624
* Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-284-2/+230
| | | | | | | | EE: Trace as artifacts (FileStorage and ObjectStorage) Closes #4171 See merge request gitlab-org/gitlab-ee!4258
* Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-2811-0/+852
Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867