Skip to content
Snippets Groups Projects

Simplify commit and snippet notes

Merged Annabel Dunstone Gray requested to merge simplify-commit-snippet-wiki-notes into master
8 files
+ 32
177
Compare changes
  • Side-by-side
  • Inline
Files
8
@@ -33,12 +33,10 @@ def show
private
def render_discussion
if serialize_notes?
prepare_notes_for_rendering(discussion.notes)
render_json_with_discussions_serializer
else
render_json_with_html
end
return unless serialize_notes?
prepare_notes_for_rendering(discussion.notes)
render_json_with_discussions_serializer
end
def render_json_with_discussions_serializer
@@ -47,14 +45,6 @@ def render_json_with_discussions_serializer
.represent(discussion, context: self, render_truncated_diff_lines: true)
end
# Legacy method used to render discussions notes when not using Vue on views.
def render_json_with_html
render json: {
resolved_by: discussion.resolved_by.try(:name),
discussion_headline_html: view_to_html_string('discussions/_headline', discussion: discussion)
}
end
# rubocop: disable CodeReuse/ActiveRecord
def noteable
@noteable ||= noteable_finder_class.new(current_user, project_id: @project.id).find_by!(iid: params[:noteable_id])
Loading