summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-22 09:10:32 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:57 -0600
commit5c7f9d69e3db27921acf6d8259245f2b4babcc2b (patch)
treeb90334ce234ddd3921e0f1780cf3bb0848adff7b /lib/gitlab/diff
parent02494f7ce86fbf1276b384f45f58558c427eff63 (diff)
downloadgitlab-ce-5c7f9d69e3db27921acf6d8259245f2b4babcc2b.tar.gz
Fix code for cops
Diffstat (limited to 'lib/gitlab/diff')
-rw-r--r--lib/gitlab/diff/position.rb19
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/gitlab/diff/position.rb b/lib/gitlab/diff/position.rb
index 81c93f1aab5..fc728123c97 100644
--- a/lib/gitlab/diff/position.rb
+++ b/lib/gitlab/diff/position.rb
@@ -140,15 +140,16 @@ module Gitlab
def find_diff_file(repository)
# We're at the initial commit, so just get that as we can't compare to anything.
- compare = if Gitlab::Git.blank_ref?(start_sha)
- Gitlab::Git::Commit.find(repository.raw_repository, head_sha)
- else
- Gitlab::Git::Compare.new(
- repository.raw_repository,
- start_sha,
- head_sha
- )
- end
+ compare =
+ if Gitlab::Git.blank_ref?(start_sha)
+ Gitlab::Git::Commit.find(repository.raw_repository, head_sha)
+ else
+ Gitlab::Git::Compare.new(
+ repository.raw_repository,
+ start_sha,
+ head_sha
+ )
+ end
diff = compare.diffs(paths: paths).first