diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-03 04:06:25 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-10 17:53:34 +0300 |
| commit | 0eb21fd840378d54967fad055cafd1a1a6ecf55d (patch) | |
| tree | 532066c07ab6a519d3caa99a64f5e7b7bb2fb533 | |
| parent | 78c7c11dda5a90e3440e822bed80e7b76bea9065 (diff) | |
| download | gitlab-ce-0eb21fd840378d54967fad055cafd1a1a6ecf55d.tar.gz | |
Vue migration fix syntax highlighting.
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 index 222a5dcfc2e..03a642d7ff2 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 @@ -49,7 +49,7 @@ $(() => { mergeConflictsStore.setLoadingState(false); this.$nextTick(() => { - $(conflictsEl.querySelectorAll('.js-syntax-highlight')).syntaxHighlight(); + $('.js-syntax-highlight').syntaxHighlight(); }); }); }, |