diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 18:38:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 18:38:24 +0000 |
commit | 983a0bba5d2a042c4a3bbb22432ec192c7501d82 (patch) | |
tree | b153cd387c14ba23bd5a07514c7c01fddf6a78a0 /app/models/lfs_object.rb | |
parent | a2bddee2cdb38673df0e004d5b32d9f77797de64 (diff) | |
download | gitlab-ce-983a0bba5d2a042c4a3bbb22432ec192c7501d82.tar.gz |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/models/lfs_object.rb')
-rw-r--r-- | app/models/lfs_object.rb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/app/models/lfs_object.rb b/app/models/lfs_object.rb index c5233deaa96..6a86aebae39 100644 --- a/app/models/lfs_object.rb +++ b/app/models/lfs_object.rb @@ -17,8 +17,6 @@ class LfsObject < ApplicationRecord mount_uploader :file, LfsObjectUploader - before_save :set_file_store, if: ->(lfs_object) { lfs_object.file_store.nil? } - after_save :update_file_store, if: :saved_change_to_file? def self.not_linked_to_project(project) @@ -57,17 +55,6 @@ class LfsObject < ApplicationRecord def self.calculate_oid(path) self.hexdigest(path) end - - private - - def set_file_store - self.file_store = - if LfsObjectUploader.object_store_enabled? && LfsObjectUploader.direct_upload_enabled? - LfsObjectUploader::Store::REMOTE - else - file.object_store - end - end end LfsObject.prepend_if_ee('EE::LfsObject') |