diff options
| author | Phil Hughes <me@iamphill.com> | 2018-07-24 11:35:05 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-07-24 11:35:05 +0000 |
| commit | e36f49fb4f01cafecc9ddc6934de33d51a97f135 (patch) | |
| tree | baf6a48ff3f9f55dcf748dc5dbd030176e260246 | |
| parent | 7dabb48e9b186db19359b6e0b9884ece3620a782 (diff) | |
| parent | a64821866ae26f75a30a224f9a814f3fe3e54ed9 (diff) | |
| download | gitlab-ce-e36f49fb4f01cafecc9ddc6934de33d51a97f135.tar.gz | |
Merge branch '43011-typecast-markdownversion-prop-notesapp' into 'master'
Fix Vue datatype errors for markdownVersion parsing
See merge request gitlab-org/gitlab-ce!20800
| -rw-r--r-- | app/assets/javascripts/notes/index.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/43011-typecast-markdownversion-prop-notesapp.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/index.js b/app/assets/javascripts/notes/index.js index 6dd4c9d66ac..3aef30c608c 100644 --- a/app/assets/javascripts/notes/index.js +++ b/app/assets/javascripts/notes/index.js @@ -15,7 +15,7 @@ document.addEventListener('DOMContentLoaded', () => { const notesDataset = document.getElementById('js-vue-notes').dataset; const parsedUserData = JSON.parse(notesDataset.currentUserData); const noteableData = JSON.parse(notesDataset.noteableData); - const { markdownVersion } = notesDataset; + const markdownVersion = parseInt(notesDataset.markdownVersion, 10); let currentUserData = {}; noteableData.noteableType = notesDataset.noteableType; diff --git a/changelogs/unreleased/43011-typecast-markdownversion-prop-notesapp.yml b/changelogs/unreleased/43011-typecast-markdownversion-prop-notesapp.yml new file mode 100644 index 00000000000..b60aeba860a --- /dev/null +++ b/changelogs/unreleased/43011-typecast-markdownversion-prop-notesapp.yml @@ -0,0 +1,5 @@ +--- +title: Fix Vue datatype errors for markdownVersion parsing +merge_request: 20800 +author: +type: fixed |