diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-21 04:12:46 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-21 04:12:46 -0700 |
| commit | 08be25eb4b9e618dcc65a0ffaea5bf0c63dc8a65 (patch) | |
| tree | 19f552cab1e40375d154b42ecde2b9c269a3c36d | |
| parent | e67574fe77dfb2ed4f6c9ed8ee96ddeef647f2ff (diff) | |
| parent | a38c6550db410a5264a8056044f562fac7ab4b92 (diff) | |
| download | gitlab-ce-08be25eb4b9e618dcc65a0ffaea5bf0c63dc8a65.tar.gz | |
Merge pull request #4826 from amouhzi/patch-1
Fix bug in ace-src-noconflict with Relative url.
| -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) { |