diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
| commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
| tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /app/models/upload.rb | |
| parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) | |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'app/models/upload.rb')
| -rw-r--r-- | app/models/upload.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/models/upload.rb b/app/models/upload.rb index ac7ebb31abc..a4fbc703146 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -16,14 +16,13 @@ class Upload < ApplicationRecord scope :with_files_stored_locally, -> { where(store: ObjectStorage::Store::LOCAL) } scope :with_files_stored_remotely, -> { where(store: ObjectStorage::Store::REMOTE) } - before_save :calculate_checksum!, if: :foreground_checksummable? - after_commit :schedule_checksum, if: :needs_checksum? - - after_commit :update_project_statistics, on: [:create, :destroy], if: :project? - + before_save :calculate_checksum!, if: :foreground_checksummable? # as the FileUploader is not mounted, the default CarrierWave ActiveRecord # hooks are not executed and the file will not be deleted after_destroy :delete_file!, if: -> { uploader_class <= FileUploader } + after_commit :schedule_checksum, if: :needs_checksum? + + after_commit :update_project_statistics, on: [:create, :destroy], if: :project? class << self def inner_join_local_uploads_projects |