diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-28 16:24:51 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-28 16:24:51 +0000 |
| commit | bb88fb7ea234fc28824c8e5490194271478c4cc6 (patch) | |
| tree | d6e79d74f1523eb1e16142ad68c6253b1c9edf37 | |
| parent | 57838e331c75aeab08a89d23c22f54a074477519 (diff) | |
| parent | acdea516c1d14ef17256858507b7a4316f01350f (diff) | |
| download | gitlab-ce-bb88fb7ea234fc28824c8e5490194271478c4cc6.tar.gz | |
Merge branch 'patch-28' into 'master'
Returns a correct TMP_UPLOAD_PATH to workhourse
Closes #46763
See merge request gitlab-org/gitlab-ce!19148
| -rw-r--r-- | app/uploaders/object_storage.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/patch-28.yml | 5 | ||||
| -rw-r--r-- | spec/requests/api/runner_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/lfs_http_spec.rb | 2 | ||||
| -rw-r--r-- | spec/uploaders/object_storage_spec.rb | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb index f2a8afccdeb..3fd27d9acdc 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -11,7 +11,7 @@ module ObjectStorage ObjectStorageUnavailable = Class.new(StandardError) DIRECT_UPLOAD_TIMEOUT = 4.hours - TMP_UPLOAD_PATH = 'tmp/upload'.freeze + TMP_UPLOAD_PATH = 'tmp/uploads'.freeze module Store LOCAL = 1 diff --git a/changelogs/unreleased/patch-28.yml b/changelogs/unreleased/patch-28.yml new file mode 100644 index 00000000000..1bbca138cae --- /dev/null +++ b/changelogs/unreleased/patch-28.yml @@ -0,0 +1,5 @@ +--- +title: Fix FreeBSD can not upload artifacts due to wrong tmp path +merge_request: 19148 +author: +type: fixed diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index 827c6dd4af1..6aadf839dbd 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -1225,7 +1225,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do before do fog_connection.directories.get('artifacts').files.create( - key: 'tmp/upload/12312300', + key: 'tmp/uploads/12312300', body: 'content' ) diff --git a/spec/requests/lfs_http_spec.rb b/spec/requests/lfs_http_spec.rb index f80abb06fca..79672fe1cc5 100644 --- a/spec/requests/lfs_http_spec.rb +++ b/spec/requests/lfs_http_spec.rb @@ -1089,7 +1089,7 @@ describe 'Git LFS API and storage' do context 'with valid remote_id' do before do fog_connection.directories.get('lfs-objects').files.create( - key: 'tmp/upload/12312300', + key: 'tmp/uploads/12312300', body: 'content' ) end diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index e7277b337f6..4165a005063 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -618,7 +618,7 @@ describe ObjectStorage do let!(:fog_file) do fog_connection.directories.get('uploads').files.create( - key: 'tmp/upload/test/123123', + key: 'tmp/uploads/test/123123', body: 'content' ) end |