summaryrefslogtreecommitdiff
path: root/app/services/notes/create_service.rb
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-02-06 12:43:12 +0000
committerWinnie Hellmann <winnie@gitlab.com>2019-02-06 12:43:12 +0000
commit16b825d3f01eef6c3b92d11feba82e88c9491f0e (patch)
tree25fa11b2e836ac66694625b874be09ca1cb0099f /app/services/notes/create_service.rb
parent7c54409fe91b73f3e5ddfe7078d0421be2cab772 (diff)
downloadgitlab-ce-revert-880afe22.tar.gz
Revert "Merge branch '30299-discussion-from-individual-note' into 'master'"revert-880afe22
This reverts merge request !24480
Diffstat (limited to 'app/services/notes/create_service.rb')
-rw-r--r--app/services/notes/create_service.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index b975c3a8cb6..c4546f30235 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -34,10 +34,6 @@ module Notes
end
if !only_commands && note.save
- if note.part_of_discussion? && note.discussion.can_convert_to_discussion?
- note.discussion.convert_to_discussion!.save(touch: false)
- end
-
todo_service.new_note(note, current_user)
clear_noteable_diffs_cache(note)
Suggestions::CreateService.new(note).execute