diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-29 15:14:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-29 15:14:45 +0300 |
commit | 27f6da0ab2b8f1945a78709c7b5d540a6cc400fd (patch) | |
tree | 1a9d2e332984f457e359f4bed051596e96ee6088 /app/models/concerns/file_store_mounter.rb | |
parent | a056c4d05f51985f2228dcb66d302279855e9b3c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/file_store_mounter.rb')
-rw-r--r-- | app/models/concerns/file_store_mounter.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/models/concerns/file_store_mounter.rb b/app/models/concerns/file_store_mounter.rb index 9d4463e5297..bfcf8a1e7b9 100644 --- a/app/models/concerns/file_store_mounter.rb +++ b/app/models/concerns/file_store_mounter.rb @@ -7,15 +7,13 @@ module FileStoreMounter def mount_file_store_uploader(uploader) mount_uploader(:file, uploader) + # This hook is a no-op when the file is uploaded after_commit after_save :update_file_store, if: :saved_change_to_file? end end - private - def update_file_store - # The file.object_store is set during `uploader.store!` - # which happens after object is inserted/updated - self.update_column(:file_store, file.object_store) + # The file.object_store is set during `uploader.store!` and `uploader.migrate!` + update_column(:file_store, file.object_store) end end |