diff options
author | Robert Speicher <robert@gitlab.com> | 2017-02-13 18:05:02 +0000 |
---|---|---|
committer | Regis <boudinot.regis@yahoo.com> | 2017-02-14 15:54:33 -0700 |
commit | e1a238c3bfac8a81df998d9d6f4c7525ffad3812 (patch) | |
tree | 0b3d51017e637db77296aa93a883c33a379f45dd | |
parent | 500204990acbd703027462d0f1d7d483568ddc1c (diff) | |
download | gitlab-ce-e1a238c3bfac8a81df998d9d6f4c7525ffad3812.tar.gz |
Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master'
Respect autocrlf setting when creating/updating file through web UI
Closes gitlab-com/www-gitlab-com#1152
See merge request !9198
-rw-r--r-- | app/models/repository.rb | 8 | ||||
-rw-r--r-- | spec/models/repository_spec.rb | 11 |
2 files changed, 19 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) diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 9bfa6409607..838fd3754b2 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -351,6 +351,17 @@ describe Repository, models: true do expect(blob.data).to eq('Changelog!') end + it 'respects the autocrlf setting' do + repository.commit_file(user, 'hello.txt', "Hello,\r\nWorld", + message: 'Add hello world', + branch_name: 'master', + update: true) + + blob = repository.blob_at('master', 'hello.txt') + + expect(blob.data).to eq("Hello,\nWorld") + end + context "when an author is specified" do it "uses the given email/name to set the commit's author" do expect do |