5883ce95ef
The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
22 lines
479 B
Ruby
22 lines
479 B
Ruby
class UploadService
|
|
include Gitlab::CurrentSettings
|
|
|
|
def initialize(model, file, uploader_class = FileUploader)
|
|
@model, @file, @uploader_class = model, file, uploader_class
|
|
end
|
|
|
|
def execute
|
|
return nil unless @file && @file.size <= max_attachment_size
|
|
|
|
uploader = @uploader_class.new(@model)
|
|
uploader.store!(@file)
|
|
|
|
uploader.to_h
|
|
end
|
|
|
|
private
|
|
|
|
def max_attachment_size
|
|
current_application_settings.max_attachment_size.megabytes.to_i
|
|
end
|
|
end
|