From b03b31659b0101dc4a5838bec7dca193706661cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mica=C3=ABl=20Bergeron?= <mbergeron@gitlab.com>
Date: Fri, 2 Mar 2018 16:19:17 -0500
Subject: fixing some broken merges

---
 app/uploaders/attachment_uploader.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/uploaders/attachment_uploader.rb')

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
 
-- 
cgit v1.2.3