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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
28ef06c5
Commit
28ef06c5
authored
8 years ago
by
Sean McGivern
Committed by
Fatih Acet
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge conflict reading for new diffs
parent
10321bf8
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/models/merge_request.rb
app/models/merge_request.rb
+2
-2
lib/gitlab/conflict/file_collection.rb
lib/gitlab/conflict/file_collection.rb
+1
-1
No files found.
app/models/merge_request.rb
View file @
28ef06c5
...
...
@@ -204,7 +204,7 @@ class MergeRequest < ActiveRecord::Base
def
diff_start_commit
if
persisted?
merge_request_diff
.
start_commit
merge_request_diff
.
start_commit
||
target_branch_head
else
target_branch_head
end
...
...
@@ -212,7 +212,7 @@ class MergeRequest < ActiveRecord::Base
def
diff_head_commit
if
persisted?
merge_request_diff
.
head_commit
merge_request_diff
.
head_commit
||
source_branch_head
else
source_branch_head
end
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/conflict/file_collection.rb
View file @
28ef06c5
...
...
@@ -5,7 +5,7 @@ module Gitlab
def
initialize
(
merge_request
)
@merge_request
=
merge_request
@our_commit
=
merge_request
.
diff_head_commit
.
raw
.
raw_commit
@our_commit
=
merge_request
.
source_branch_head
.
raw
.
raw_commit
@their_commit
=
merge_request
.
target_branch_head
.
raw
.
raw_commit
end
...
...
This diff is collapsed.
Click to expand it.
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