Add CompareAction class for collecting commits and diffs using satellites

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 14 insertions, 2 deletions

diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 0684461add7..7dce71a677b 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -86,7 +86,7 @@ class MergeRequestDiff < ActiveRecord::Base
   # between target and source branches
   def unmerged_commits
     commits = if merge_request.for_fork?
-                Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).commits_between
+                compare_action.commits
               else
                 repository.commits_between(target_branch, source_branch)
               end
@@ -150,7 +150,7 @@ class MergeRequestDiff < ActiveRecord::Base
   # between target and source branches
   def unmerged_diffs
     diffs = if merge_request.for_fork?
-              Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).diffs_between_satellite
+              compare_action.diffs
             else
               Gitlab::Git::Diff.between(repository, source_branch, target_branch)
             end
@@ -165,4 +165,16 @@ class MergeRequestDiff < ActiveRecord::Base
   def repository
     merge_request.target_project.repository
   end
+
+  private
+
+  def compare_action
+    Gitlab::Satellite::CompareAction.new(
+      merge_request.author,
+      merge_request.target_project,
+      merge_request.target_branch,
+      merge_request.source_project,
+      merge_request.source_branch
+    )
+  end
 end