From 6eb65651a71776725db35528d11f6cef4e0261bf Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 7 Jul 2016 14:14:13 -0400 Subject: [PATCH] We can't call private methods with `self.` --- app/models/merge_request_diff.rb | 10 +++++----- 1 file 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