diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 06:08:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 06:08:49 +0000 |
| commit | 6305f1dc00870f6e0635e2e850538a00bbd00bda (patch) | |
| tree | 8a518cae3805b8d7269bfacc8ae60aa441fadb22 /app/assets/javascripts/mr_notes | |
| parent | 1d388ed855838a2d50588c131f9f23815f148344 (diff) | |
| download | gitlab-ce-6305f1dc00870f6e0635e2e850538a00bbd00bda.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/mr_notes')
| -rw-r--r-- | app/assets/javascripts/mr_notes/init_notes.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/mr_notes/init_notes.js b/app/assets/javascripts/mr_notes/init_notes.js index a942bcc13da..2580f8e86b1 100644 --- a/app/assets/javascripts/mr_notes/init_notes.js +++ b/app/assets/javascripts/mr_notes/init_notes.js @@ -69,13 +69,11 @@ export default () => { }, }, render(createElement) { - const isDiffView = this.activeTab === 'diffs'; - // NOTE: Even though `discussionKeyboardNavigator` is added to the `notes-app`, // it adds a global key listener so it works on the diffs tab as well. // If we create a single Vue app for all of the MR tabs, we should move this // up the tree, to the root. - return createElement(discussionKeyboardNavigator, { props: { isDiffView } }, [ + return createElement(discussionKeyboardNavigator, [ createElement('notes-app', { props: { noteableData: this.noteableData, |