b38c75b3dc
Correct more usages of non-relative `fixture_file_upload` paths
2018-06-07 09:54:41 -05:00
6d165c740c
Make all uses of `fixture_file_upload` use relative paths
2018-06-07 09:54:41 -05:00
4484587ef8
another round of EE code removal
2018-03-02 13:21:03 -05:00
a22f6fa6e5
Merge branch 'fix/sm/atomic-migration' into 'master'
...
Fix migrate! method (Minimal fix with ExclusiveLock to prevent race conditions)
Closes #4928 and #4980
See merge request gitlab-org/gitlab-ee!4624
2018-02-28 21:28:26 +01:00
729391fbfc
Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport
2018-02-28 21:11:53 +01:00
8af23def1d
Revert "Merge branch '3867-port-to-ce' into 'master'"
...
This reverts commit 54a575f1bbc63af942e5
2018-02-28 21:09:34 +01:00
999118f0ec
Merge branch 'feature/sm/artifacts-trace-ee' into 'master'
...
EE: Trace as artifacts (FileStorage and ObjectStorage)
Closes #4171
See merge request gitlab-org/gitlab-ee!4258
2018-02-28 20:59:25 +01:00
a7dae52e9d
Merge branch '4163-move-uploads-to-object-storage' into 'master'
...
Move uploads to object storage
Closes #4163
See merge request gitlab-org/gitlab-ee!3867
2018-02-28 20:58:15 +01:00
6ca02a4150
Merge branch 'zj-multiple-artifacts-ee' into 'master'
...
Multiple artifacts ee
See merge request gitlab-org/gitlab-ee!3276
2018-02-28 20:44:09 +01:00
2057a6acde
port of 594e6a0a625^..f74c90f68c6
2018-02-01 12:14:46 -05:00
2b6307f6ad
Enable RuboCop Style/RegexpLiteral
2018-02-01 02:06:07 +09:00
93ea3234df
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
2018-01-24 17:25:55 +00:00
6881d09174
Fix rubocop
2017-12-03 12:04:49 +01:00
ee8efb3d67
Sync ArtifactUploader specs with EE
2017-12-03 12:04:49 +01:00
38c61ab6df
Fix specs failures, and use factory with `:ci_job_artifact, :archive`
2017-12-03 12:04:49 +01:00
61864a5a5b
Rename Artifact to JobArtifact, split metadata out
...
Two things at ones, as there was no clean way to seperate the commit and
give me feedback from the tests.
But the model Artifact is now JobArtifact, and the table does not have a
type anymore, but the metadata is now its own model:
Ci::JobArtifactMetadata.
2017-12-03 12:04:48 +01:00
Robert Speicher