Commit 6eb65651 authored by Douwe Maan's avatar Douwe Maan

We can't call private methods with `self.`

parent ac26b237
...@@ -39,7 +39,7 @@ class MergeRequestDiff < ActiveRecord::Base ...@@ -39,7 +39,7 @@ class MergeRequestDiff < ActiveRecord::Base
if options[:ignore_whitespace_change] if options[:ignore_whitespace_change]
@diffs_no_whitespace ||= begin @diffs_no_whitespace ||= begin
compare = Gitlab::Git::Compare.new( compare = Gitlab::Git::Compare.new(
self.repository.raw_repository, repository.raw_repository,
self.start_commit_sha || self.target_branch_sha, self.start_commit_sha || self.target_branch_sha,
self.head_commit_sha || self.source_branch_sha, self.head_commit_sha || self.source_branch_sha,
) )
...@@ -87,7 +87,7 @@ class MergeRequestDiff < ActiveRecord::Base ...@@ -87,7 +87,7 @@ class MergeRequestDiff < ActiveRecord::Base
merge_request.fetch_ref merge_request.fetch_ref
Gitlab::Git::Compare.new( Gitlab::Git::Compare.new(
self.repository.raw_repository, repository.raw_repository,
self.target_branch_sha, self.target_branch_sha,
self.source_branch_sha self.source_branch_sha
) )
...@@ -228,8 +228,8 @@ class MergeRequestDiff < ActiveRecord::Base ...@@ -228,8 +228,8 @@ class MergeRequestDiff < ActiveRecord::Base
end end
def keep_around_commits def keep_around_commits
self.repository.keep_around(target_branch_sha) repository.keep_around(target_branch_sha)
self.repository.keep_around(source_branch_sha) repository.keep_around(source_branch_sha)
self.repository.keep_around(branch_base_sha) repository.keep_around(branch_base_sha)
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment