From 759bcb6fbb36db919c1b7cb7067098e02e26a372 Mon Sep 17 00:00:00 2001 From: Simon Knox Date: Mon, 4 Dec 2017 17:37:03 +1100 Subject: issueData -> noteableData --- app/views/projects/merge_requests/show.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index b0e85f9aa4a..368669f2640 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -88,8 +88,9 @@ quick_actions_docs_path: help_page_path('user/project/quick_actions'), notes_path: notes_url, last_fetched_at: Time.now.to_i, - issue_data: serialize_issuable(@merge_request), + noteable_data: serialize_issuable(@merge_request), current_user_data: UserSerializer.new.represent(current_user).to_json} } + -# TODO: handle logged out user. currently eturns "null" - else = render "projects/merge_requests/discussion" -- cgit v1.2.1