diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-30 19:33:45 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b (patch) | |
| tree | c63719f281b3e38c149ce8a7425d826850914f80 /app/services/notes | |
| parent | 2058e71e63c9ac471137f831b4d04b6626968532 (diff) | |
| download | gitlab-ce-bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b.tar.gz | |
Don't use original_discussion_id
Diffstat (limited to 'app/services/notes')
| -rw-r--r-- | app/services/notes/build_service.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/services/notes/build_service.rb b/app/services/notes/build_service.rb index eddfcf5f391..4619ba552d7 100644 --- a/app/services/notes/build_service.rb +++ b/app/services/notes/build_service.rb @@ -5,9 +5,7 @@ module Notes new_discussion = params.delete(:new_discussion) if project && in_reply_to_discussion_id.present? - discussion = - project.notes.find_original_discussion(in_reply_to_discussion_id) || - project.notes.find_discussion(in_reply_to_discussion_id) + discussion = project.notes.find_discussion(in_reply_to_discussion_id) unless discussion note = Note.new |