Merge branch 'patch-28' into 'master'

Returns a correct TMP_UPLOAD_PATH to workhourse

Closes #46763

See merge request gitlab-org/gitlab-ce!19148

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

changelogs/unreleased/patch-28.yml

+---
+title: Fix FreeBSD can not upload artifacts due to wrong tmp path
+merge_request: 19148
+author:
+type: fixed

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'
                   )
 

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

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