summaryrefslogtreecommitdiff
path: root/app/controllers/projects/notes_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-10 15:09:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-10 15:09:14 +0000
commitff06f859cdabec3c874c004f93fe5082aeacf917 (patch)
tree5269b37a4cd5181869267e3ce9ece4d11518752b /app/controllers/projects/notes_controller.rb
parenta08f8baa63c0aea7fcf969da40d30e6cf56365cc (diff)
downloadgitlab-ce-ff06f859cdabec3c874c004f93fe5082aeacf917.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
-rw-r--r--app/controllers/projects/notes_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index e50e293a103..77fd7688caf 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -60,7 +60,7 @@ class Projects::NotesController < Projects::ApplicationController
def render_json_with_notes_serializer
prepare_notes_for_rendering([note])
- render json: note_serializer.represent(note)
+ render json: note_serializer.represent(note, render_truncated_diff_lines: true)
end
def note