diff options
author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-02-22 10:46:13 -0500 |
---|---|---|
committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-01 10:36:56 -0500 |
commit | 5cf1cc6a0fe1a60cf51bc44535df8cc17d10b3a0 (patch) | |
tree | affb51535b5184d4bc04ccd70dedfc89ee83904f /app | |
parent | 50c08d0eda6a1863e025b09c20dc2e4a38754ff4 (diff) | |
download | gitlab-ce-5cf1cc6a0fe1a60cf51bc44535df8cc17d10b3a0.tar.gz |
remove the license check
Diffstat (limited to 'app')
-rw-r--r-- | app/uploaders/object_storage.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb index 95f54b14d04..43d881e5aba 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -105,7 +105,6 @@ module ObjectStorage included do |base| base.include(ObjectStorage) - before :store, :verify_license! after :migrate, :delete_migrated_file end @@ -130,10 +129,6 @@ module ObjectStorage object_store_options.remote_directory end - def licensed? - License.feature_available?(:object_storage) - end - def serialization_column(model_class, mount_point) model_class.uploader_options.dig(mount_point, :mount_on) || mount_point end @@ -248,12 +243,6 @@ module ObjectStorage migrated_file.delete if exists? end - def verify_license!(_file) - return if file_storage? - - raise(ObjectStorageUnavailable, 'Object Storage feature is missing') unless self.class.licensed? - end - def exists? file.present? end @@ -274,7 +263,6 @@ module ObjectStorage def schedule_background_upload? self.class.object_store_enabled? && self.class.background_upload_enabled? && - self.class.licensed? && self.file_storage? end |