Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f4978bc0
Commit
f4978bc0
authored
Aug 08, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix unmerged diff for non-fork MR
parent
3f9b1d62
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
app/models/merge_request.rb
app/models/merge_request.rb
+2
-1
No files found.
app/models/merge_request.rb
View file @
f4978bc0
...
@@ -152,7 +152,7 @@ class MergeRequest < ActiveRecord::Base
...
@@ -152,7 +152,7 @@ class MergeRequest < ActiveRecord::Base
diffs
=
if
for_fork?
diffs
=
if
for_fork?
Gitlab
::
Satellite
::
MergeAction
.
new
(
author
,
self
).
diffs_between_satellite
Gitlab
::
Satellite
::
MergeAction
.
new
(
author
,
self
).
diffs_between_satellite
else
else
Gitlab
::
Git
::
Diff
.
between
(
project
.
repository
,
source_branch
,
target_branch
)
Gitlab
::
Git
::
Diff
.
between
(
target_
project
.
repository
,
source_branch
,
target_branch
)
end
end
diffs
||=
[]
diffs
||=
[]
...
@@ -195,6 +195,7 @@ class MergeRequest < ActiveRecord::Base
...
@@ -195,6 +195,7 @@ class MergeRequest < ActiveRecord::Base
else
else
commits
=
target_project
.
repository
.
commits_between
(
self
.
target_branch
,
self
.
source_branch
)
commits
=
target_project
.
repository
.
commits_between
(
self
.
target_branch
,
self
.
source_branch
)
end
end
if
commits
.
present?
if
commits
.
present?
commits
=
Commit
.
decorate
(
commits
).
commits
=
Commit
.
decorate
(
commits
).
sort_by
(
&
:created_at
).
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