summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/application.js1
-rw-r--r--app/assets/stylesheets/application.scss1
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
*/