From a38c6550db410a5264a8056044f562fac7ab4b92 Mon Sep 17 00:00:00 2001 From: Hassan Amouhzi Date: Wed, 21 Aug 2013 09:13:50 +0200 Subject: Fix bug in ace-src-noconflict with Relative url. If we doesn't use a relative url we have this: 
gon.relative_url_root=""
Else 
gon.relative_url_root="/gitlab"
Gitlab::Application.config.assets.prefix contains: 
/assets
--- app/views/projects/edit_tree/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml index 06396ba992b..b1fb4f8637d 100644 --- a/app/views/projects/edit_tree/show.html.haml +++ b/app/views/projects/edit_tree/show.html.haml @@ -31,7 +31,7 @@ = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-cancel", confirm: leave_edit_message :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 editor = ace.edit("editor"); if (ace_mode) { -- cgit v1.2.1