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
79fcd7b9
Commit
79fcd7b9
authored
Oct 30, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in app/models/repository.rb
parent
10593a8a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
17 deletions
+0
-17
app/models/repository.rb
app/models/repository.rb
+0
-17
No files found.
app/models/repository.rb
View file @
79fcd7b9
...
@@ -911,7 +911,6 @@ class Repository
...
@@ -911,7 +911,6 @@ class Repository
def
merged_to_root_ref?
(
branch_or_name
,
pre_loaded_merged_branches
=
nil
)
def
merged_to_root_ref?
(
branch_or_name
,
pre_loaded_merged_branches
=
nil
)
branch
=
Gitlab
::
Git
::
Branch
.
find
(
self
,
branch_or_name
)
branch
=
Gitlab
::
Git
::
Branch
.
find
(
self
,
branch_or_name
)
<<<<<<<
HEAD
if
branch
if
branch
root_ref_sha
=
commit
(
root_ref
).
sha
root_ref_sha
=
commit
(
root_ref
).
sha
...
@@ -923,26 +922,12 @@ class Repository
...
@@ -923,26 +922,12 @@ class Repository
ancestor?
(
branch
.
target
,
root_ref_sha
)
ancestor?
(
branch
.
target
,
root_ref_sha
)
end
end
=======
if
branch
root_ref_sha
=
commit
(
root_ref
).
sha
same_head
=
branch
.
target
==
root_ref_sha
merged
=
if
pre_loaded_merged_branches
pre_loaded_merged_branches
.
include?
(
branch
.
name
)
else
ancestor?
(
branch
.
target
,
root_ref_sha
)
end
>>>>>>>
ce
-
com
/
master
!
same_head
&&
merged
!
same_head
&&
merged
else
else
nil
nil
end
end
end
end
<<<<<<<
HEAD
def
fetch_upstream
(
url
)
def
fetch_upstream
(
url
)
add_remote
(
Repository
::
MIRROR_REMOTE
,
url
)
add_remote
(
Repository
::
MIRROR_REMOTE
,
url
)
fetch_remote
(
Repository
::
MIRROR_REMOTE
,
ssh_auth:
project
&
.
import_data
)
fetch_remote
(
Repository
::
MIRROR_REMOTE
,
ssh_auth:
project
&
.
import_data
)
...
@@ -991,8 +976,6 @@ class Repository
...
@@ -991,8 +976,6 @@ class Repository
end
end
end
end
=======
>>>>>>>
ce
-
com
/
master
delegate
:merged_branch_names
,
to: :raw_repository
delegate
:merged_branch_names
,
to: :raw_repository
def
merge_base
(
first_commit_id
,
second_commit_id
)
def
merge_base
(
first_commit_id
,
second_commit_id
)
...
...
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