diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-05 12:13:39 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-05 12:13:39 +0000 |
| commit | 9f75b7a47fbfe352f7b099769861b1cc0a9617eb (patch) | |
| tree | 4dd734b6e853595e0cf9f8e0df87df7012e33d42 | |
| parent | c925820ac0649216ab1d7c05cf7b8232f2f2a6fd (diff) | |
| parent | 359b65beac43e009b715c2db048e06b6f96b0ee8 (diff) | |
| download | gitlab-ce-9f75b7a47fbfe352f7b099769861b1cc0a9617eb.tar.gz | |
Merge branch 'gitaly-conflict-file' into 'master'
Small Gitlab::Git fixes for Gitaly
See merge request gitlab-org/gitlab-ce!15675
| -rw-r--r-- | lib/gitlab/git/conflict/file.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/git/conflict/resolver.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/conflict/file.rb b/lib/gitlab/git/conflict/file.rb index fc1595f1faf..b2a625e08fa 100644 --- a/lib/gitlab/git/conflict/file.rb +++ b/lib/gitlab/git/conflict/file.rb @@ -2,7 +2,7 @@ module Gitlab module Git module Conflict class File - attr_reader :content, :their_path, :our_path, :our_mode, :repository + attr_reader :content, :their_path, :our_path, :our_mode, :repository, :commit_oid def initialize(repository, commit_oid, conflict, content) @repository = repository diff --git a/lib/gitlab/git/conflict/resolver.rb b/lib/gitlab/git/conflict/resolver.rb index df509c5f4ce..de8cce41b6d 100644 --- a/lib/gitlab/git/conflict/resolver.rb +++ b/lib/gitlab/git/conflict/resolver.rb @@ -75,7 +75,7 @@ module Gitlab resolved_lines = file.resolve_lines(params[:sections]) new_file = resolved_lines.map { |line| line[:full_line] }.join("\n") - new_file << "\n" if file.our_blob.data.ends_with?("\n") + new_file << "\n" if file.our_blob.data.end_with?("\n") elsif params[:content] new_file = file.resolve_content(params[:content]) end |