Download as
Browse Code »

Commit a38c6550db410a5264a8056044f562fac7ab4b92

Authored by Hassan Amouhzi
1 parent 0a44ecf3
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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>
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/views/projects/edit_tree/show.html.haml
  Diff comments   View file @a38c655
... ... @@ -31,7 +31,7 @@
31 31 = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-cancel", confirm: leave_edit_message
32 32  
33 33 :javascript
34   - ace.config.set("modePath", "#{Gitlab::Application.config.assets.prefix}/ace-src-noconflict")
  34 + ace.config.set("modePath", gon.relative_url_root + "#{Gitlab::Application.config.assets.prefix}/ace-src-noconflict")
35 35 var ace_mode = "#{@blob.language.try(:ace_mode)}";
36 36 var editor = ace.edit("editor");
37 37 if (ace_mode) {
... ...