diff options
| -rw-r--r-- | app/models/merge_request.rb | 3 | ||||
| -rw-r--r-- | test/unit/merge_request_test.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index d01357a..5d4c318 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -381,7 +381,8 @@ class MergeRequest < ActiveRecord::Base def push_to_tracking_repository! merge_request_repo = target_repository.tracking_repository - branch_spec = "#{ending_commit}:refs/heads/merge_requests/#{id}" + branch_spec = "#{ending_commit}:refs/reviews/#{id}" source_repository.git.git.push({}, merge_request_repo.full_repository_path, branch_spec) + source_repository.git.git.push({}, target_repository.full_repository_path, branch_spec) end end diff --git a/test/unit/merge_request_test.rb b/test/unit/merge_request_test.rb index d4ee44e..29fa061 100644 --- a/test/unit/merge_request_test.rb +++ b/test/unit/merge_request_test.rb @@ -415,7 +415,7 @@ class MergeRequestTest < ActiveSupport::TestCase should 'send a push command from the source repository to the merge request repository' do merge_request_repo = @merge_request.target_repository.create_tracking_repository merge_request_repo_path = merge_request_repo.full_repository_path - branch_spec = "#{@merge_request.ending_commit}:refs/heads/merge_requests/#{@merge_request.id}" + branch_spec = "#{@merge_request.ending_commit}:refs/reviews/#{@merge_request.id}" git = mock("Git") git_backend = mock("Source repository git") @@ -423,6 +423,7 @@ class MergeRequestTest < ActiveSupport::TestCase @merge_request.source_repository.stubs(:git).returns(git) git_backend.expects(:push).with({}, merge_request_repo_path, branch_spec).once + git_backend.expects(:push).with({}, @merge_request.target_repository.full_repository_path, branch_spec).once @merge_request.push_to_tracking_repository! end end |