diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-13 00:09:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-13 00:09:39 +0300 |
| commit | cdf9ef52fe13899be29068992a9858f8b0e72457 (patch) | |
| tree | d26b77d147c1a8506213c05048f026fe9ef8ad1e /app/uploaders | |
| parent | 13150a38e701080f6c64d4925c838214a3f5ef2c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/uploaders')
| -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 7db1b29ca9a..5297112eef8 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -137,8 +137,6 @@ module ObjectStorage included do |base| base.include(ObjectStorage) - include_if_ee('::EE::ObjectStorage::Concern') # rubocop: disable Cop/InjectEnterpriseEditionModule - after :migrate, :delete_migrated_file end @@ -463,3 +461,5 @@ module ObjectStorage end end end + +ObjectStorage::Concern.include_if_ee('::EE::ObjectStorage::Concern') |