kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Implement update of ref when merge request code is reloaded

This commit is contained in:
Dmitriy Zaporozhets 2015-07-15 16:52:50 +02:00
parent 2a6f522cac
commit cb6f34e367
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/models/merge_request_diff.rb
View File

@ -160,14 +160,23 @@ class MergeRequestDiff < ActiveRecord::Base
private
def compare_result
source_sha = merge_request.source_project.commit(source_branch).sha
@compare_result ||=
begin
source_sha = merge_request.source_project.commit(source_branch).sha
@compare_result ||= CompareService.new.execute(
merge_request.author,
merge_request.target_project,
source_sha,
merge_request.target_project,
merge_request.target_branch,
)
merge_request.target_project.repository.fetch_ref(
merge_request.source_project.repository.path_to_repo,
"refs/heads/#{merge_request.source_branch}",
"refs/merge-requests/#{merge_request.id}/head"
)
CompareService.new.execute(
merge_request.author,
merge_request.target_project,
source_sha,
merge_request.target_project,
merge_request.target_branch,
)
end
end
end