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
Léo-Paul Géneau
gitlab-ce
Commits
04c328f9
Commit
04c328f9
authored
Aug 08, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ee_compat_check when EE branch uses a prefix
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
c946ee12
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
lib/gitlab/ee_compat_check.rb
lib/gitlab/ee_compat_check.rb
+3
-2
No files found.
lib/gitlab/ee_compat_check.rb
View file @
04c328f9
...
@@ -98,10 +98,11 @@ module Gitlab
...
@@ -98,10 +98,11 @@ module Gitlab
if
status
.
zero?
if
status
.
zero?
@ee_branch_found
=
ee_branch_prefix
@ee_branch_found
=
ee_branch_prefix
else
return
_
,
status
=
step
(
"Fetching origin/
#{
ee_branch_suffix
}
"
,
%W[git fetch origin
#{
ee_branch_suffix
}
]
)
end
end
_
,
status
=
step
(
"Fetching origin/
#{
ee_branch_suffix
}
"
,
%W[git fetch origin
#{
ee_branch_suffix
}
]
)
if
status
.
zero?
if
status
.
zero?
@ee_branch_found
=
ee_branch_suffix
@ee_branch_found
=
ee_branch_suffix
else
else
...
...
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