diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-26 21:33:04 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-26 21:33:04 +0200 |
| commit | c7966a426bab8c6807efad094a5fee0381a901e2 (patch) | |
| tree | 3bdb91cdd3be4a933eebc3d8b52553f6bac8eb9e | |
| parent | 2a496c095ab355fd1819c8434ed72e640ba1aa2c (diff) | |
| download | gitlab-ce-c7966a426bab8c6807efad094a5fee0381a901e2.tar.gz | |
Include highlight.js assets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index aa2db1fc93c..9ff116a6644 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -24,6 +24,7 @@ //= require g.raphael-min //= require g.bar-min //= require branch-graph +//= require highlightjs.min //= require ace-src-noconflict/ace //= require_tree . //= require d3 diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index eb8bc0d63c0..7d766c305d4 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -5,6 +5,7 @@ *= require jquery.ui.gitlab *= require jquery.atwho *= require select2 + *= require highlightjs.min *= require_self */ |