summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/application.js
diff options
context:
space:
mode:
authorValeriy Sizov <vsv2711@gmail.com>2012-10-09 20:11:49 +0300
committerValeriy Sizov <vsv2711@gmail.com>2012-10-12 20:07:24 +0300
commit57e2b5ed1adf330f2b1684d3e8aed311087d4304 (patch)
tree4302868028e570feca4ce41fa8e2e4fe6bdb1c0f /app/assets/javascripts/application.js
parent3b5c7b6e9aead85ffaa5d669639e69989da8a5b8 (diff)
downloadgitlab-ce-57e2b5ed1adf330f2b1684d3e8aed311087d4304.tar.gz
WebEditor: integrated editor
Diffstat (limited to 'app/assets/javascripts/application.js')
-rw-r--r--app/assets/javascripts/application.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index d582a1a1727..21554ba396d 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -18,4 +18,5 @@
//= require chosen-jquery
//= require raphael
//= require branch-graph
+//= require ace-src-noconflict/ace.js
//= require_tree .