diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 21:09:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 21:09:03 +0300 |
commit | d7ce7307dca551759ffa972015875f8ebe476927 (patch) | |
tree | 7cb8c211b737de7120dd2f1e825852e77ac5d380 /lib/gitlab/background_migration | |
parent | e43077ab4742ba5083a01a1e5341db1a1b7a1701 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/background_migration')
3 files changed, 4 insertions, 8 deletions
diff --git a/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb b/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb index 7d40dfbcdc4..40f45301727 100644 --- a/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb +++ b/lib/gitlab/background_migration/user_mentions/create_resource_user_mention.rb @@ -13,7 +13,7 @@ module Gitlab def perform(resource_model, join, conditions, with_notes, start_id, end_id) resource_model = "#{ISOLATION_MODULE}::#{resource_model}".constantize if resource_model.is_a?(String) - model = with_notes ? "#{ISOLATION_MODULE}::Note".constantize : resource_model + model = with_notes ? Gitlab::BackgroundMigration::UserMentions::Models::Note : resource_model resource_user_mention_model = resource_model.user_mention_model records = model.joins(join).where(conditions).where(id: start_id..end_id) @@ -21,7 +21,7 @@ module Gitlab records.in_groups_of(BULK_INSERT_SIZE, false).each do |records| mentions = [] records.each do |record| - mentions << record.build_mention_values + mentions << record.build_mention_values(resource_user_mention_model.resource_foreign_key) end Gitlab::Database.bulk_insert( diff --git a/lib/gitlab/background_migration/user_mentions/models/concerns/isolated_mentionable.rb b/lib/gitlab/background_migration/user_mentions/models/concerns/isolated_mentionable.rb index 40aab896212..b7fa92a6686 100644 --- a/lib/gitlab/background_migration/user_mentions/models/concerns/isolated_mentionable.rb +++ b/lib/gitlab/background_migration/user_mentions/models/concerns/isolated_mentionable.rb @@ -65,11 +65,11 @@ module Gitlab false end - def build_mention_values + def build_mention_values(resource_foreign_key) refs = all_references(author) { - "#{self.user_mention_model.resource_foreign_key}": user_mention_resource_id, + "#{resource_foreign_key}": user_mention_resource_id, note_id: user_mention_note_id, mentioned_users_ids: array_to_sql(refs.mentioned_users.pluck(:id)), mentioned_projects_ids: array_to_sql(refs.mentioned_projects.pluck(:id)), diff --git a/lib/gitlab/background_migration/user_mentions/models/note.rb b/lib/gitlab/background_migration/user_mentions/models/note.rb index c2828202907..dc364d7af5a 100644 --- a/lib/gitlab/background_migration/user_mentions/models/note.rb +++ b/lib/gitlab/background_migration/user_mentions/models/note.rb @@ -19,10 +19,6 @@ module Gitlab belongs_to :noteable, polymorphic: true belongs_to :project - def user_mention_model - "#{CreateResourceUserMention::ISOLATION_MODULE}::#{noteable.class}".constantize.user_mention_model - end - def for_personal_snippet? noteable.class.name == 'PersonalSnippet' end |