Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
5db31e0301e7
Commit
f4978bc0
authored
Aug 08, 2013
by
Dmitriy Zaporozhets
Browse files
Fix unmerged diff for non-fork MR
parent
b4e94f9981e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/models/merge_request.rb
View file @
5db31e03
...
...
@@ -152,7 +152,7 @@ def unmerged_diffs
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 @@ def unmerged_commits
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
).
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment