Merge pull request #7222 from jhund/fix-5936

Don't remove trailing newline when editing a file in web UI editor

app/controllers/projects/edit_tree_controller.rb

@@ -28,8 +28,6 @@ class Projects::EditTreeController < Projects::BaseTreeController
 
   def preview
     @content = params[:content]
-    #FIXME workaround https://github.com/gitlabhq/gitlabhq/issues/5936
-    @content += "\n" if @blob.data.end_with?("\n")
 
     diffy = Diffy::Diff.new(@blob.data, @content, diff: '-U 3',
                             include_diff_info: true)

app/views/projects/edit_tree/show.html.haml

@@ -16,7 +16,7 @@
           .btn-group.tree-btn-group
             = link_to "Cancel", @after_edit_path, class: "btn btn-tiny btn-cancel", data: { confirm: leave_edit_message }
       .file-content.code
-        %pre.js-edit-mode-pane#editor= @blob.data
+        %pre.js-edit-mode-pane#editor
         .js-edit-mode-pane#preview.hide
           .center
             %h2
@@ -43,6 +43,7 @@
   ace.config.set("modePath", gon.relative_url_root + "#{Gitlab::Application.config.assets.prefix}/ace")
   var ace_mode = "#{@blob.language.try(:ace_mode)}";
   var editor = ace.edit("editor");
+  editor.setValue("#{escape_javascript(@blob.data)}");
   if (ace_mode) {
     editor.getSession().setMode('ace/mode/' + ace_mode);
   }