Merge branch '3900-fix-rebase_for_forks' into 'master'

Resolve "Failed to rebase MR from forked repo"

Closes #3900

See merge request gitlab-org/gitlab-ee!3258

app/services/merge_requests/rebase_service.rb

@@ -24,7 +24,7 @@ module MergeRequests
       )
 
       run_git_command(
-        %W(rebase #{merge_request.target_branch}),
+        %W(pull --rebase #{target_project.repository.path_to_repo} #{merge_request.target_branch}),
         tree_path,
         git_env.merge('GIT_COMMITTER_NAME' => current_user.name,
                       'GIT_COMMITTER_EMAIL' => current_user.email),

changelogs/unreleased-ee/3900-fix-rebase_for_forks.yml

+---
+title: 'Fix: Failed to rebase MR from forked repo'
+merge_request:
+author:
+type: fixed

spec/services/merge_requests/rebase_service_spec.rb

 require 'spec_helper'
 
 describe MergeRequests::RebaseService do
+  include ProjectForksHelper
+
   let(:user) { create(:user) }
   let(:merge_request) do
     create(:merge_request,
@@ -104,6 +106,31 @@ describe MergeRequests::RebaseService do
           service.execute(merge_request)
         end
       end
+
+      context 'fork' do
+        let(:forked_project) do
+          fork_project(project, user, repository: true)
+        end
+
+        let(:merge_request_from_fork) do
+          forked_project.repository.create_file(
+            user,
+            'new-file-to-target',
+            '',
+            message: 'Add new file to target',
+            branch_name: 'master')
+
+          create(:merge_request,
+                 source_branch: 'master', source_project: forked_project,
+                 target_branch: 'master', target_project: project)
+        end
+
+        it 'rebases source branch' do
+          parent_sha = forked_project.repository.commit(merge_request_from_fork.source_branch).parents.first.sha
+          target_branch_sha = project.repository.commit(merge_request_from_fork.target_branch).sha
+          expect(parent_sha).to eq(target_branch_sha)
+        end
+      end
     end
   end
 end