summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-08-17 18:55:04 +0200
committerDouwe Maan <douwe@selenight.nl>2017-08-17 18:55:04 +0200
commit99ba5d0d5097e3170747d17261bb3b9f60aa49fb (patch)
treeeaf44ae1f96e288b6affeacb300d1f0b84a51b71 /app/controllers/concerns
parent3ef93db5a8dfb62f877731237a53fbdb8bc6e5f8 (diff)
downloadgitlab-ce-99ba5d0d5097e3170747d17261bb3b9f60aa49fb.tar.gz
Remove view=full_data from NotesController
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/notes_actions.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb
index 1809464f4f4..29142e70ed8 100644
--- a/app/controllers/concerns/notes_actions.rb
+++ b/app/controllers/concerns/notes_actions.rb
@@ -18,8 +18,7 @@ module NotesActions
@notes = prepare_notes_for_rendering(@notes)
notes_json[:notes] =
- case params[:view]
- when 'full_data'
+ if noteable.is_a?(Issue)
note_serializer.represent(@notes)
else
@notes.map { |note| note_json(note) }
@@ -88,8 +87,7 @@ module NotesActions
if note.persisted?
attrs[:valid] = true
- case params[:view]
- when 'full_data'
+ if noteable.is_a?(Issue)
attrs.merge!(note_serializer.represent(note))
else
attrs.merge!(
@@ -179,8 +177,6 @@ module NotesActions
end
def set_polling_interval_header
- return unless noteable.is_a?(Issue)
-
Gitlab::PollingInterval.set_header(response, interval: 6_000)
end