Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/bulk_imports/entity.rb')
-rw-r--r--app/models/bulk_imports/entity.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/bulk_imports/entity.rb b/app/models/bulk_imports/entity.rb
index a075c2f7e4f..894e28dd88a 100644
--- a/app/models/bulk_imports/entity.rb
+++ b/app/models/bulk_imports/entity.rb
@@ -54,9 +54,11 @@ class BulkImports::Entity < ApplicationRecord
enum source_type: { group_entity: 0, project_entity: 1 }
scope :by_user_id, ->(user_id) { joins(:bulk_import).where(bulk_imports: { user_id: user_id }) }
- scope :stale, -> { where('created_at < ?', 8.hours.ago).where(status: [0, 1]) }
+ scope :stale, -> { where('updated_at < ?', 24.hours.ago).where(status: [0, 1]) }
scope :by_bulk_import_id, ->(bulk_import_id) { where(bulk_import_id: bulk_import_id) }
scope :order_by_created_at, ->(direction) { order(created_at: direction) }
+ scope :order_by_updated_at_and_id, ->(direction) { order(updated_at: direction, id: :asc) }
+ scope :with_trackers, -> { includes(:trackers) }
alias_attribute :destination_slug, :destination_name
@@ -198,6 +200,7 @@ class BulkImports::Entity < ApplicationRecord
return unless failures.any?
update!(has_failures: true)
+ bulk_import.update!(has_failures: true)
end
def source_version