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
eceec267
Commit
eceec267
authored
Nov 22, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try to always find the merge base using `origin/#{branch}` instead of just `#{branch}`
parent
9fefb6c2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lib/gitlab/ee_compat_check.rb
lib/gitlab/ee_compat_check.rb
+1
-1
No files found.
lib/gitlab/ee_compat_check.rb
View file @
eceec267
...
@@ -182,7 +182,7 @@ module Gitlab
...
@@ -182,7 +182,7 @@ module Gitlab
def
merge_base_found?
(
master_remote
:,
branch
:)
def
merge_base_found?
(
master_remote
:,
branch
:)
step
(
step
(
"Finding merge base with
#{
master_remote
}
/master"
,
"Finding merge base with
#{
master_remote
}
/master"
,
%W[git merge-base
#{
master_remote
}
/master
#{
branch
}
]
%W[git merge-base
#{
master_remote
}
/master
origin/
#{
branch
}
]
)
do
|
output
,
status
|
)
do
|
output
,
status
|
if
status
.
zero?
if
status
.
zero?
puts
"Merge base was found:
#{
output
}
"
puts
"Merge base was found:
#{
output
}
"
...
...
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