diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-10 06:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-10 06:09:53 +0300 |
| commit | a8b811acdfb8200f30cdd70d290e87bb7ac46ab1 (patch) | |
| tree | 2c99eda1590d125cbee2350e373a63fee4d76f44 /app/services/upload_service.rb | |
| parent | d8995bd33ff3a76a6d04a6900229c78c2fbcc0a6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/upload_service.rb')
| -rw-r--r-- | app/services/upload_service.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/services/upload_service.rb b/app/services/upload_service.rb index 403944557a2..ba6ead41836 100644 --- a/app/services/upload_service.rb +++ b/app/services/upload_service.rb @@ -6,16 +6,18 @@ class UploadService end def execute - return unless @file && @file.size <= max_attachment_size + return unless file && file.size <= max_attachment_size - uploader = @uploader_class.new(@model, nil, @uploader_context) - uploader.store!(@file) + uploader = uploader_class.new(model, nil, **uploader_context) + uploader.store!(file) uploader end private + attr_reader :model, :file, :uploader_class, :uploader_context + def max_attachment_size Gitlab::CurrentSettings.max_attachment_size.megabytes.to_i end |