Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix/sm/atomic-migration' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -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ński | 2018-02-28 | 4 | -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 McGivern | 2018-02-28 | 11 | -0/+852 |
Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867 |