summaryrefslogtreecommitdiff
path: root/lib/gitlab/sanitizers
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2019-07-09 20:51:42 +0200
committerJan Provaznik <jprovaznik@gitlab.com>2019-08-23 11:19:14 +0200
commit41d52bbfe9725a93013ea6b072efcdc16e591b14 (patch)
treeb8ab973e0173fd61f32f17f19c47476b1638c40d /lib/gitlab/sanitizers
parent36a729f05f1b9c2b3935b9d121b8fe3172ce5cc1 (diff)
downloadgitlab-ce-41d52bbfe9725a93013ea6b072efcdc16e591b14.tar.gz
Add direct upload support for personal snippets
Diffstat (limited to 'lib/gitlab/sanitizers')
-rw-r--r--lib/gitlab/sanitizers/exif.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/gitlab/sanitizers/exif.rb b/lib/gitlab/sanitizers/exif.rb
index bb4e4ce7bbc..2f3d14ecebd 100644
--- a/lib/gitlab/sanitizers/exif.rb
+++ b/lib/gitlab/sanitizers/exif.rb
@@ -53,15 +53,18 @@ module Gitlab
end
# rubocop: disable CodeReuse/ActiveRecord
- def batch_clean(start_id: nil, stop_id: nil, dry_run: true, sleep_time: nil)
+ def batch_clean(start_id: nil, stop_id: nil, dry_run: true, sleep_time: nil, uploader: nil, since: nil)
relation = Upload.where('lower(path) like ? or lower(path) like ? or lower(path) like ?',
'%.jpg', '%.jpeg', '%.tiff')
+ relation = relation.where(uploader: uploader) if uploader
+ relation = relation.where('created_at > ?', since) if since
logger.info "running in dry run mode, no images will be rewritten" if dry_run
find_params = {
start: start_id.present? ? start_id.to_i : nil,
- finish: stop_id.present? ? stop_id.to_i : Upload.last&.id
+ finish: stop_id.present? ? stop_id.to_i : Upload.last&.id,
+ batch_size: 1000
}
relation.find_each(find_params) do |upload|