summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValeriy Sizov <vsv2711@gmail.com>2012-10-16 23:52:44 +0300
committerValeriy Sizov <vsv2711@gmail.com>2012-10-16 23:52:44 +0300
commit8ee8f36f6ea5155037d847d2c0876a363a4c1808 (patch)
tree0227faf470aa402b8d29494fc06d9e708f81443d
parent2a750bf2ca649fb7aac6ae352a6eb1c4d7820c9f (diff)
downloadgitlab-ce-8ee8f36f6ea5155037d847d2c0876a363a4c1808.tar.gz
WebEditor: fix unknown theme in production mode
-rw-r--r--app/assets/javascripts/application.js2
-rw-r--r--app/views/tree/edit.html.haml1
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 21554ba396d..d88f2a669e7 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -18,5 +18,5 @@
//= require chosen-jquery
//= require raphael
//= require branch-graph
-//= require ace-src-noconflict/ace.js
+//= require ace-src-noconflict/ace
//= require_tree .
diff --git a/app/views/tree/edit.html.haml b/app/views/tree/edit.html.haml
index b81373b5587..d84f542c849 100644
--- a/app/views/tree/edit.html.haml
+++ b/app/views/tree/edit.html.haml
@@ -21,7 +21,6 @@
:javascript
var editor = ace.edit("editor");
- editor.setTheme("ace/theme/twilight");
editor.getSession().setMode("ace/mode/javascript");
$(".save-btn").click(function(){