diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-12-04 17:37:03 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-12-04 17:37:03 +1100 |
| commit | 759bcb6fbb36db919c1b7cb7067098e02e26a372 (patch) | |
| tree | 2dc83d12d1fef14e0f62e605e7d09c8a47ce23eb | |
| parent | 534b143d80a9a045b7e24cb0733dcc80c5f1603a (diff) | |
| download | gitlab-ce-vue-notes.tar.gz | |
issueData -> noteableDatavue-notes
| -rw-r--r-- | app/assets/javascripts/mr_discussions/index.js | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/mr_discussions/index.js b/app/assets/javascripts/mr_discussions/index.js index 6c33cd2cbad..d45b31a00c0 100644 --- a/app/assets/javascripts/mr_discussions/index.js +++ b/app/assets/javascripts/mr_discussions/index.js @@ -9,7 +9,7 @@ document.addEventListener('DOMContentLoaded', () => new Vue({ data() { const notesDataset = document.getElementById('js-vue-mr-discussions').dataset; return { - issueData: JSON.parse(notesDataset.issueData), + noteableData: JSON.parse(notesDataset.noteableData), currentUserData: JSON.parse(notesDataset.currentUserData), notesData: { lastFetchedAt: notesDataset.lastFetchedAt, @@ -25,7 +25,7 @@ document.addEventListener('DOMContentLoaded', () => new Vue({ render(createElement) { return createElement('issue-notes-app', { props: { - issueData: this.issueData, + noteableData: this.noteableData, notesData: this.notesData, userData: this.currentUserData, }, 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" |