Respect autocrlf setting when creating/updating file through web UI

1 files changed, 8 insertions, 0 deletions

diff --git a/app/models/repository.rb b/app/models/repository.rb
index d2d92a064a4..56c582cd9be 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -1230,6 +1230,14 @@ class Repository
                   action[:content]
                 end
 
+      detect = CharlockHolmes::EncodingDetector.new.detect(content) if content
+
+      unless detect && detect[:type] == :binary
+        # When writing to the repo directly as we are doing here,
+        # the `core.autocrlf` config isn't taken into account.
+        content.gsub!("\r\n", "\n") if self.autocrlf
+      end
+
       oid = rugged.write(content, :blob)
 
       index.add(path: path, oid: oid, mode: mode)