diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-03 16:09:59 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-03 16:09:59 -0500 |
| commit | b623807682022a54344d8213d6f1c902be6ade37 (patch) | |
| tree | 478ee3a25d67cb452aac09cfd42967fcfc7c22b9 /app/assets/javascripts/dispatcher.js | |
| parent | 28060caa0ade7566a38e3ed17f2db8bf9116dc1b (diff) | |
| parent | 81002745184df28fc9d969afc524986279c653bb (diff) | |
| download | gitlab-ce-b623807682022a54344d8213d6f1c902be6ade37.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/assets/javascripts/dispatcher.js')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index c70a17104fd..3dec4de06ec 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -99,7 +99,7 @@ import initChangesDropdown from './init_changes_dropdown'; path = page.split(':'); shortcut_handler = null; - $('.js-gfm-input').each((i, el) => { + $('.js-gfm-input:not(.js-vue-textarea)').each((i, el) => { const gfm = new GfmAutoComplete(gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources); const enableGFM = gl.utils.convertPermissionToBoolean(el.dataset.supportsAutocomplete); gfm.setup($(el), { @@ -172,7 +172,6 @@ import initChangesDropdown from './init_changes_dropdown'; shortcut_handler = new ShortcutsIssuable(); new ZenMode(); initIssuableSidebar(); - initNotes(); break; case 'dashboard:milestones:index': new ProjectSelect(); |