diff options
| author | Jo Hund <jhund@clearcove.ca> | 2014-06-27 10:50:36 -0700 |
|---|---|---|
| committer | Jo Hund <jhund@clearcove.ca> | 2014-06-27 10:50:36 -0700 |
| commit | df3c466e37fdd6a08b0274123d34997a2c006ba9 (patch) | |
| tree | a32fe3cc54ed6977c324cfd9b466b2d085b1372f /app/controllers | |
| parent | 024e0577c6b6ded30ee09536082bd24405bda1e5 (diff) | |
| download | gitlab-ce-df3c466e37fdd6a08b0274123d34997a2c006ba9.tar.gz | |
Don't remove trailing newline when editing a file in web UI editor:
* populate ACE editor content via API instead of HTML element inner text (to preserve trailing whitespace).
* remove hack in EditTreeController#preview that replaces any removed \n.
Fixes #5936
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/edit_tree_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/projects/edit_tree_controller.rb b/app/controllers/projects/edit_tree_controller.rb index be611892bb0..ca83b21f429 100644 --- a/app/controllers/projects/edit_tree_controller.rb +++ b/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) |