diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-11 18:13:47 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-11 18:13:47 +0000 |
| commit | c9a7c80a6f0c2919cf0a143d783fd4b4dd4fde61 (patch) | |
| tree | 7d1abe3faabc4687363cb5e7dfb09f4a55c03fb4 | |
| parent | a8da4f3fa810ed0931ee8f54ac8123fb2f484830 (diff) | |
| parent | c854fe21032dd419dafcc00eec94e468823bd139 (diff) | |
| download | gitlab-ce-c9a7c80a6f0c2919cf0a143d783fd4b4dd4fde61.tar.gz | |
Merge branch 'unify-uploaders-objects_storage.rb' into 'master'
Unify from EE for app/uploaders/object_storage.rb
See merge request gitlab-org/gitlab-ce!19660
| -rw-r--r-- | app/uploaders/object_storage.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb index 5aa1bc7227c..23b3dcf84c0 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -22,10 +22,10 @@ module ObjectStorage module RecordsUploads extend ActiveSupport::Concern - def prepended(base) + prepended do |base| raise "#{base} must include ObjectStorage::Concern to use extensions." unless base < Concern - base.include(RecordsUploads::Concern) + base.include(::RecordsUploads::Concern) end def retrieve_from_store!(identifier) |