diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-31 04:33:45 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 19:44:14 +0300 |
| commit | bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b (patch) | |
| tree | c63719f281b3e38c149ce8a7425d826850914f80 /app/controllers/projects/notes_controller.rb | |
| parent | 2058e71e63c9ac471137f831b4d04b6626968532 (diff) | |
Don't use original_discussion_id
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 8f82021a464..fb9195bb08d 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -173,12 +173,7 @@ class Projects::NotesController < Projects::ApplicationController discussion_resolvable: discussion.resolvable?, diff_discussion_html: diff_discussion_html(discussion), - discussion_html: discussion_html(discussion), - - # Since the `discussion_id` can change, for example when new commits are pushed into an MR, - # the never-changing `original_discussion_id` is used as a fallback to the find the relevant - # discussion container to add this note to. - original_discussion_id: note.original_discussion_id + discussion_html: discussion_html(discussion) ) end else |