diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-06-06 11:46:28 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-06-06 14:48:05 -0500 |
commit | 3a5d375e49b808ca203cb40b5f907aafb40f53aa (patch) | |
tree | b6083a59d35cfd4bef6a54df9aa7f95a82d6d193 /app/services | |
parent | 4ab1e07fd3fef373a83137ca851558b0f327bfd5 (diff) | |
download | gitlab-ce-3a5d375e49b808ca203cb40b5f907aafb40f53aa.tar.gz |
Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diff
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/compare_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/compare_service.rb b/app/services/compare_service.rb index ab4c02a97a0..a5ae4927412 100644 --- a/app/services/compare_service.rb +++ b/app/services/compare_service.rb @@ -17,18 +17,18 @@ class CompareService start_branch_name) do |commit| break unless commit - compare(commit.sha, target_project, target_branch, straight) + compare(commit.sha, target_project, target_branch, straight: straight) end end private - def compare(source_sha, target_project, target_branch, straight) + def compare(source_sha, target_project, target_branch, straight:) raw_compare = Gitlab::Git::Compare.new( target_project.repository.raw_repository, target_branch, source_sha, - straight + straight: straight ) Compare.new(raw_compare, target_project, straight: straight) |