We can't call private methods with `self.`
This commit is contained in:
parent
ac26b23712
commit
6eb65651a7
|
@ -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
|
||||||
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
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue