kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Douwe Maan 2016-07-07 14:14:13 -04:00
parent ac26b23712
commit 6eb65651a7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/merge_request_diff.rb
View File

@ -39,7 +39,7 @@ class MergeRequestDiff < ActiveRecord::Base
if options[:ignore_whitespace_change]
@diffs_no_whitespace ||= begin
compare = Gitlab::Git::Compare.new(
self.repository.raw_repository,
repository.raw_repository,
self.start_commit_sha || self.target_branch_sha,
self.head_commit_sha || self.source_branch_sha,
)
@ -87,7 +87,7 @@ class MergeRequestDiff < ActiveRecord::Base
merge_request.fetch_ref
Gitlab::Git::Compare.new(
self.repository.raw_repository,
repository.raw_repository,
self.target_branch_sha,
self.source_branch_sha
)
@ -228,8 +228,8 @@ class MergeRequestDiff < ActiveRecord::Base
end
def keep_around_commits
self.repository.keep_around(target_branch_sha)
self.repository.keep_around(source_branch_sha)
self.repository.keep_around(branch_base_sha)
repository.keep_around(target_branch_sha)
repository.keep_around(source_branch_sha)
repository.keep_around(branch_base_sha)
end
end