Commit 08be25eb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #4826 from amouhzi/patch-1

Fix bug in ace-src-noconflict with Relative url.
parents e67574fe a38c6550
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
= link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-cancel", confirm: leave_edit_message = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-cancel", confirm: leave_edit_message
:javascript :javascript
ace.config.set("modePath", "#{Gitlab::Application.config.assets.prefix}/ace-src-noconflict") ace.config.set("modePath", gon.relative_url_root + "#{Gitlab::Application.config.assets.prefix}/ace-src-noconflict")
var ace_mode = "#{@blob.language.try(:ace_mode)}"; var ace_mode = "#{@blob.language.try(:ace_mode)}";
var editor = ace.edit("editor"); var editor = ace.edit("editor");
if (ace_mode) { if (ace_mode) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment