diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-10 13:25:59 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-10 13:25:59 +0300 |
| commit | 33a4439e8f079303fcf7c71267936e5c8f694958 (patch) | |
| tree | 828c3c6dc55058e95927d36a3a03db9fd0263766 /app/assets/javascripts/mr_notes/index.js | |
| parent | 2db218f8bf186c509c927ce3e9d0502fee4f8349 (diff) | |
| parent | 174950b6562226beed7eef135a2450bfee60e21f (diff) | |
Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/assets/javascripts/mr_notes/index.js')
| -rw-r--r-- | app/assets/javascripts/mr_notes/index.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/mr_notes/index.js b/app/assets/javascripts/mr_notes/index.js index 096c4ef5f31..e3c5bf06b3d 100644 --- a/app/assets/javascripts/mr_notes/index.js +++ b/app/assets/javascripts/mr_notes/index.js @@ -13,8 +13,11 @@ export default function initMrNotes() { data() { const notesDataset = document.getElementById('js-vue-mr-discussions') .dataset; + const noteableData = JSON.parse(notesDataset.noteableData); + noteableData.noteableType = notesDataset.noteableType; + return { - noteableData: JSON.parse(notesDataset.noteableData), + noteableData, currentUserData: JSON.parse(notesDataset.currentUserData), notesData: JSON.parse(notesDataset.notesData), }; |