Commit 99ba5d0d authored by Douwe Maan's avatar Douwe Maan
Browse files

Remove view=full_data from NotesController

parent 1800f935cc02
......@@ -110,7 +110,6 @@
endpoint: this.endpoint,
flashContainer: this.$el,
data: {
view: 'full_data',
note: {
noteable_type: constants.NOTEABLE_TYPE,
noteable_id: this.getIssueData.id,
......
......@@ -100,7 +100,6 @@
target_type: 'issue',
target_id: this.discussion.noteable_id,
note: { note: noteText },
view: 'full_data',
},
};
......
......@@ -77,7 +77,6 @@
const data = {
endpoint: this.note.path,
note: {
view: 'full_data',
target_type: 'issue',
target_id: this.note.noteable_id,
note: { note: noteText },
......
......@@ -18,8 +18,7 @@ def index
@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 @@ def note_json(note)
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 @@ def note_params
end
def set_polling_interval_header
return unless noteable.is_a?(Issue)
Gitlab::PollingInterval.set_header(response, interval: 6_000)
end
......
......@@ -10,7 +10,7 @@
new_session_path: new_session_path(:user, redirect_to_referer: 'yes'),
markdown_docs: help_page_path('user/markdown'),
quick_actions_docs: help_page_path('user/project/quick_actions'),
notes_path: notes_url(view: 'full_data'),
notes_path: notes_url,
last_fetched_at: Time.now.to_i,
issue_data: serialize_issuable(@issue),
current_user_data: UserSerializer.new.represent(current_user).to_json } }
......
......@@ -205,14 +205,6 @@
expect(helper.notes_url).to eq("/nm/test/noteable/issue/#{@noteable.id}/notes")
end
it 'adds extra params' do
namespace = create(:namespace, path: 'nm')
@project = create(:project, path: 'test', namespace: namespace)
@noteable = create(:issue, project: @project)
expect(helper.notes_url(view: 'full_data')).to eq("/nm/test/noteable/issue/#{@noteable.id}/notes?view=full_data")
end
end
describe '#note_url' do
......
......@@ -4,7 +4,7 @@ export const notesDataMock = {
lastFetchedAt: '1501862675',
markdownDocs: '/help/user/markdown',
newSessionPath: '/users/sign_in?redirect_to_referer=yes',
notesPath: '/gitlab-org/gitlab-ce/noteable/issue/98/notes?view=full_data',
notesPath: '/gitlab-org/gitlab-ce/noteable/issue/98/notes',
quickActionsDocs: '/help/user/project/quick_actions',
registerPath: '/users/sign_in?redirect_to_referer=yes#register-pane',
};
......@@ -446,4 +446,4 @@ export const discussionNoteServerResponse = [{
"path": "/gitlab-org/gitlab-ce/notes/1471"
}],
"individual_note": false
}];
\ No newline at end of file
}];
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment