diff options
| author | Kamil Trzciński (OoO till 3th) <ayufan@ayufan.eu> | 2018-07-04 09:50:29 +0000 |
|---|---|---|
| committer | Kamil Trzciński (OoO till 3th) <ayufan@ayufan.eu> | 2018-07-04 09:50:29 +0000 |
| commit | 34694c3afc8e3476f5f070fe1c97aef9119a921b (patch) | |
| tree | 9a1c90f0bfc37d97aa5675cbfc1748cc0fce0f7d /app/controllers/concerns | |
| parent | cda22d0780ea9bf598f82f51fffb7c50a4b4b1bc (diff) | |
| parent | 249c24891a3a54d2fd6b9355244cad4e35d722f7 (diff) | |
| download | gitlab-ce-34694c3afc8e3476f5f070fe1c97aef9119a921b.tar.gz | |
Merge branch 'jprovazn-direct-upload' into 'master'
Add workhorse authorize method for project/group uploads
Closes #44663
See merge request gitlab-org/gitlab-ce!19717
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/uploads_actions.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb index 16374146ae4..434459a225a 100644 --- a/app/controllers/concerns/uploads_actions.rb +++ b/app/controllers/concerns/uploads_actions.rb @@ -45,6 +45,16 @@ module UploadsActions send_upload(uploader, attachment: uploader.filename, disposition: disposition) end + def authorize + set_workhorse_internal_api_content_type + + authorized = uploader_class.workhorse_authorize( + has_length: false, + maximum_size: Gitlab::CurrentSettings.max_attachment_size.megabytes.to_i) + + render json: authorized + end + private # Explicitly set the format. |