diff options
| author | Kevin Lyda <kevin@ie.suberic.net> | 2014-01-05 13:53:08 +0000 |
|---|---|---|
| committer | Kevin Lyda <kevin@ie.suberic.net> | 2014-01-05 13:53:08 +0000 |
| commit | 284546b2e00639bfa5e965f6a846cf308752d58e (patch) | |
| tree | 7a9f96e99fa67b718527a768a0c545c63f5ccf2b /vendor | |
| parent | dcaedb4a5e3dae774e0211935977cf4514e2a928 (diff) | |
| parent | d28ee0df124d79e9d0968c3325ae010b55d4a7b6 (diff) | |
| download | gitlab-ce-284546b2e00639bfa5e965f6a846cf308752d58e.tar.gz | |
Merge branch 'master' into logo-white-compress
Conflicts:
app/assets/images/logo-black.png
app/assets/images/logo-white.png
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/assets/javascripts/ace-src-noconflict/mode-diff.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-diff.js b/vendor/assets/javascripts/ace-src-noconflict/mode-diff.js index 75e26cc7056..8d1e7cee096 100644 --- a/vendor/assets/javascripts/ace-src-noconflict/mode-diff.js +++ b/vendor/assets/javascripts/ace-src-noconflict/mode-diff.js @@ -66,7 +66,7 @@ var DiffHighlightRules = function() { "regex": "^(?:\\*{15}|={67}|-{3}|\\+{3})$", "token": "punctuation.definition.separator.diff", "name": "keyword" - }, { //diff.range.unified + }, { //diff.range.inline "regex": "^(@@)(\\s*.+?\\s*)(@@)(.*)$", "token": [ "constant", |