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
9471c3f6
Commit
9471c3f6
authored
May 24, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try to fetch the CE branch in EE because sometimes it has the same name
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
7736b518
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/ee_compat_check.rb
lib/gitlab/ee_compat_check.rb
+2
-2
No files found.
lib/gitlab/ee_compat_check.rb
View file @
9471c3f6
...
@@ -138,8 +138,8 @@ module Gitlab
...
@@ -138,8 +138,8 @@ module Gitlab
def
ee_branch_presence_check!
def
ee_branch_presence_check!
ee_remotes
.
keys
.
each
do
|
remote
|
ee_remotes
.
keys
.
each
do
|
remote
|
[
ee_branch_prefix
,
ee_branch_suffix
].
each
do
|
branch
|
[
ce_branch
,
ee_branch_prefix
,
ee_branch_suffix
].
each
do
|
branch
|
_
,
status
=
step
(
"Fetching
#{
remote
}
/
#{
ee_branch_prefix
}
"
,
%W[git fetch
#{
remote
}
#{
branch
}
]
)
_
,
status
=
step
(
"Fetching
#{
remote
}
/
#{
branch
}
"
,
%W[git fetch
#{
remote
}
#{
branch
}
]
)
if
status
.
zero?
if
status
.
zero?
@ee_remote_with_branch
=
remote
@ee_remote_with_branch
=
remote
...
...
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