diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-03 09:07:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-03 09:07:06 +0300 |
| commit | a3759fc2e1f8aa1493840ab0d4ebd4a2e5f495aa (patch) | |
| tree | fb8f046819669955006fe21043bfcc13dbe40209 /lib/gitlab/background_migration | |
| parent | 336483a4c150a112e83d95538218c59d9a952768 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/background_migration')
| -rw-r--r-- | lib/gitlab/background_migration/delete_orphans_approval_merge_request_rules.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/background_migration/legacy_upload_mover.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/background_migration/delete_orphans_approval_merge_request_rules.rb b/lib/gitlab/background_migration/delete_orphans_approval_merge_request_rules.rb index b75bda51ef3..4b7b7d42c77 100644 --- a/lib/gitlab/background_migration/delete_orphans_approval_merge_request_rules.rb +++ b/lib/gitlab/background_migration/delete_orphans_approval_merge_request_rules.rb @@ -4,7 +4,7 @@ module Gitlab module BackgroundMigration # Deletes orphans records whenever report_type equals to scan_finding (i.e., 4) class DeleteOrphansApprovalMergeRequestRules < BatchedMigrationJob - scope_to -> (relation) { relation.where(report_type: 4) } + scope_to ->(relation) { relation.where(report_type: 4) } operation_name :delete_all diff --git a/lib/gitlab/background_migration/legacy_upload_mover.rb b/lib/gitlab/background_migration/legacy_upload_mover.rb index 1879a6c5427..2b2a7d65d08 100644 --- a/lib/gitlab/background_migration/legacy_upload_mover.rb +++ b/lib/gitlab/background_migration/legacy_upload_mover.rb @@ -109,7 +109,7 @@ module Gitlab old_path = upload.absolute_path old_path_sub = '-/system/note/attachment' - if !File.exist?(old_path) || !old_path.include?(old_path_sub) + if !File.exist?(old_path) || old_path.exclude?(old_path_sub) log_legacy_diff_note_problem(old_path) return false end |