Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-03-14 01:13:12 +0300
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-05 19:44:14 +0300
commit9c30b0e918ca035d8555de5e3393247f6d00ed16 (patch)
tree7aeea9695748036cf465952711184f2469427fab /app/helpers
parent336016fa858dfa48b9f9e9b5b2d9c3a9000fffe5 (diff)
Fix some specs
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/notes_helper.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 01ecac983cf..e2fa9905e86 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -54,17 +54,15 @@ module NotesHelper
if use_legacy_diff_note
new_note = LegacyDiffNote.new(@new_diff_note_attrs.merge(line_code: line_code))
- discussion_id = new_note.discussion_id
else
new_note = DiffNote.new(@new_diff_note_attrs.merge(position: position))
- discussion_id = new_note.discussion_id
data[:position] = position.to_json
end
data.merge(
note_type: new_note.type,
- discussion_id: discussion_id
+ discussion_id: new_note.discussion_class.discussion_id(new_note)
)
end