diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-02 16:19:17 -0500 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-02 16:19:17 -0500 |
| commit | b03b31659b0101dc4a5838bec7dca193706661cd (patch) | |
| tree | 3bd1004659f85da6d149f89700b7c0e8388f0b31 /app/uploaders | |
| parent | 4484587ef8c9bf63c60359a0980dda95e854b744 (diff) | |
| download | gitlab-ce-b03b31659b0101dc4a5838bec7dca193706661cd.tar.gz | |
fixing some broken merges
Diffstat (limited to 'app/uploaders')
| -rw-r--r-- | app/uploaders/attachment_uploader.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/uploaders/attachment_uploader.rb b/app/uploaders/attachment_uploader.rb index 11e038f9327..cd819dc9bff 100644 --- a/app/uploaders/attachment_uploader.rb +++ b/app/uploaders/attachment_uploader.rb @@ -2,6 +2,7 @@ class AttachmentUploader < GitlabUploader include RecordsUploads::Concern include ObjectStorage::Concern prepend ObjectStorage::Extension::RecordsUploads + include UploaderHelper private |