diff options
author | Hassan Amouhzi <github@anezi.net> | 2013-08-21 09:13:50 +0200 |
---|---|---|
committer | Hassan Amouhzi <github@anezi.net> | 2013-08-21 09:13:50 +0200 |
commit | a38c6550db410a5264a8056044f562fac7ab4b92 (patch) | |
tree | 81ae5ab1ad1361ffb9934cf878be1ae34cb7b770 /app/views | |
parent | 0a44ecf3a0eb7be66b2dbbb6e8404e3242a4b016 (diff) | |
download | gitlab-ce-a38c6550db410a5264a8056044f562fac7ab4b92.tar.gz |
Fix bug in ace-src-noconflict with Relative url.
If we doesn't use a relative url we have this:
<pre>gon.relative_url_root=""</pre>
Else <pre>gon.relative_url_root="/gitlab"</pre>
Gitlab::Application.config.assets.prefix contains:
<pre>/assets</pre>
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/edit_tree/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |