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 /db | |
parent | e43077ab4742ba5083a01a1e5341db1a1b7a1701 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/post_migrate/20191115115522_migrate_epic_notes_mentions_to_db.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/post_migrate/20191115115522_migrate_epic_notes_mentions_to_db.rb b/db/post_migrate/20191115115522_migrate_epic_notes_mentions_to_db.rb index e0b3c36b57d..7914ff59dbd 100644 --- a/db/post_migrate/20191115115522_migrate_epic_notes_mentions_to_db.rb +++ b/db/post_migrate/20191115115522_migrate_epic_notes_mentions_to_db.rb @@ -14,7 +14,7 @@ class MigrateEpicNotesMentionsToDb < ActiveRecord::Migration[5.2] INDEX_NAME = 'epic_mentions_temp_index' INDEX_CONDITION = "note LIKE '%@%'::text AND notes.noteable_type = 'Epic'" QUERY_CONDITIONS = "#{INDEX_CONDITION} AND epic_user_mentions.epic_id IS NULL" - JOIN = 'LEFT JOIN epic_user_mentions ON notes.id = epic_user_mentions.note_id' + JOIN = 'INNER JOIN epics ON epics.id = notes.noteable_id LEFT JOIN epic_user_mentions ON notes.id = epic_user_mentions.note_id' class Note < ActiveRecord::Base include EachBatch |