diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-09 07:40:24 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-09 07:40:24 +0000 |
| commit | 47d5ef4bd54ac493a35d190d0909059b6e35c0fe (patch) | |
| tree | 2e87f930813f4a0473a0db7133c5697bf8947dbf /app | |
| parent | 22995fc9324774ce5301589d05a4687793faddac (diff) | |
| parent | 437cccf9a9aecb44681e8b82921fd748297953d4 (diff) | |
| download | gitlab-ce-47d5ef4bd54ac493a35d190d0909059b6e35c0fe.tar.gz | |
Merge branch 'update-highlight-js' into 'master'
Update highlight.js to 8.1
Pack version including all supported languages. Yay for Haml, Clojure, Go and Erlang support!
Fixes #1411.
See merge request !956
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 5b124554c38..a28f76ddd15 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -23,7 +23,7 @@ #= require g.raphael-min #= require g.bar-min #= require branch-graph -#= require highlightjs.min +#= require highlight.pack #= require ace/ace #= require d3 #= require underscore |