diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/services/issuable | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/services/issuable')
4 files changed, 4 insertions, 4 deletions
diff --git a/app/services/issuable/clone/attributes_rewriter.rb b/app/services/issuable/clone/attributes_rewriter.rb index e1b4613726d..d8b639bb422 100644 --- a/app/services/issuable/clone/attributes_rewriter.rb +++ b/app/services/issuable/clone/attributes_rewriter.rb @@ -99,7 +99,7 @@ module Issuable yield(event) end.compact - Gitlab::Database.bulk_insert(table_name, events) # rubocop:disable Gitlab/BulkInsert + Gitlab::Database.main.bulk_insert(table_name, events) # rubocop:disable Gitlab/BulkInsert end end diff --git a/app/services/issuable/clone/base_service.rb b/app/services/issuable/clone/base_service.rb index 574fe85b466..1d2c5c06d1b 100644 --- a/app/services/issuable/clone/base_service.rb +++ b/app/services/issuable/clone/base_service.rb @@ -14,7 +14,7 @@ module Issuable # Using transaction because of a high resources footprint # on rewriting notes (unfolding references) # - ActiveRecord::Base.transaction do + ApplicationRecord.transaction do @new_entity = create_new_entity update_new_entity diff --git a/app/services/issuable/common_system_notes_service.rb b/app/services/issuable/common_system_notes_service.rb index aedd0c377c6..38050708fc5 100644 --- a/app/services/issuable/common_system_notes_service.rb +++ b/app/services/issuable/common_system_notes_service.rb @@ -9,7 +9,7 @@ module Issuable # We disable touch so that created system notes do not update # the noteable's updated_at field - ActiveRecord::Base.no_touching do + ApplicationRecord.no_touching do if is_update if issuable.previous_changes.include?('title') create_title_change_note(issuable.previous_changes['title'].first) diff --git a/app/services/issuable/destroy_label_links_service.rb b/app/services/issuable/destroy_label_links_service.rb index 6fff9b5e8d2..49000d90c1f 100644 --- a/app/services/issuable/destroy_label_links_service.rb +++ b/app/services/issuable/destroy_label_links_service.rb @@ -22,7 +22,7 @@ module Issuable SQL loop do - result = ActiveRecord::Base.connection.execute(delete_query) + result = LabelLink.connection.execute(delete_query) break if result.cmd_tuples == 0 end |