summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-07-07 14:14:13 -0400
committerDouwe Maan <douwe@selenight.nl>2016-07-07 14:14:13 -0400
commit6eb65651a71776725db35528d11f6cef4e0261bf (patch)
treee3e8ce4ef09d0fd13b8feca19e7f2fe877dde59f
parentac26b23712963b0471db9742fc340ea4fb8935a9 (diff)
downloadgitlab-ce-6eb65651a71776725db35528d11f6cef4e0261bf.tar.gz
We can't call private methods with `self.`
-rw-r--r--app/models/merge_request_diff.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 9c898d9d7c0..ba235750aeb 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -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