diff options
| author | Alexandru Croitor <acroitor@gitlab.com> | 2019-07-05 18:45:07 +0300 |
|---|---|---|
| committer | Alexandru Croitor <acroitor@gitlab.com> | 2019-07-12 12:29:04 +0300 |
| commit | 435be1442f03372f42c368efdd8bf941a577e7b6 (patch) | |
| tree | b5703cc1ea710d23871bd33950ae219e1bc85116 /app | |
| parent | 1def071991dddf6a1500c84d9e53a0edd64d45a1 (diff) | |
| download | gitlab-ce-435be1442f03372f42c368efdd8bf941a577e7b6.tar.gz | |
Fix reply to discussion on promoted epic11445-fix-promoted-epic-inherited-discussions-ce
Regenerate discussion_id for notes that are being copied over to the
epic when issue is promoted to epic.
https://gitlab.com/gitlab-org/gitlab-ee/issues/11445
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/issuable/clone/content_rewriter.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/issuable/clone/content_rewriter.rb b/app/services/issuable/clone/content_rewriter.rb index 00d7078859d..f75b51c4be3 100644 --- a/app/services/issuable/clone/content_rewriter.rb +++ b/app/services/issuable/clone/content_rewriter.rb @@ -23,10 +23,14 @@ module Issuable end def rewrite_notes + new_discussion_ids = {} original_entity.notes_with_associations.find_each do |note| new_note = note.dup + new_discussion_ids[note.discussion_id] ||= Discussion.discussion_id(new_note) new_params = { - project: new_entity.project, noteable: new_entity, + project: new_entity.project, + noteable: new_entity, + discussion_id: new_discussion_ids[note.discussion_id], note: rewrite_content(new_note.note), note_html: nil, created_at: note.created_at, |