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

Fix unmerged diff for non-fork MR

This commit is contained in:
Dmitriy Zaporozhets 2013-08-08 12:44:33 +03:00
parent 3f9b1d62ef
commit f4978bc08e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/merge_request.rb
View File

@ -152,7 +152,7 @@ class MergeRequest < ActiveRecord::Base
diffs = if for_fork?
Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite
else
Gitlab::Git::Diff.between(project.repository, source_branch, target_branch)
Gitlab::Git::Diff.between(target_project.repository, source_branch, target_branch)
end
diffs ||= []
@ -195,6 +195,7 @@ class MergeRequest < ActiveRecord::Base
else
commits = target_project.repository.commits_between(self.target_branch, self.source_branch)
end
if commits.present?
commits = Commit.decorate(commits).
sort_by(&:created_at).