diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 12:32:35 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:35 -0500 |
| commit | f5de2ce3fd74af214556f677f54efa3f4da13ed3 (patch) | |
| tree | 0edf872e4c129664468401f7619aab82521e8ee5 /app/assets/javascripts/merge_conflicts | |
| parent | 3764fd4b4166bdf869cc04e4e82558d6b80b4ca5 (diff) | |
| download | gitlab-ce-f5de2ce3fd74af214556f677f54efa3f4da13ed3.tar.gz | |
Add syntax highlighting to files
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 index 417095a8db7..3379414343f 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 @@ -55,6 +55,7 @@ this.fileLoaded = true; this.editor = ace.edit(content); this.editor.$blockScrolling = Infinity; // Turn off annoying warning + this.editor.getSession().setMode(`ace/mode/${file.blob_ace_mode}`); this.editor.on('change', () => { this.saveDiffResolution(); }); |