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
Kazuhiko Shiozaki
gitlab-ce
Commits
9a0e7c0e
Commit
9a0e7c0e
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4224 from hiroponz/fix-abort-gitlab-app-check
Fix abort gitlab:app:check
parents
1b4a9941
c18564d2
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
lib/gitlab/version_info.rb
lib/gitlab/version_info.rb
+1
-1
lib/tasks/gitlab/check.rake
lib/tasks/gitlab/check.rake
+2
-2
No files found.
lib/gitlab/version_info.rb
View file @
9a0e7c0e
...
...
@@ -5,7 +5,7 @@ module Gitlab
attr_reader
:major
,
:minor
,
:patch
def
self
.
parse
(
str
)
if
m
=
str
.
match
(
/(\d+)\.(\d+)\.(\d+)/
)
if
str
&&
m
=
str
.
match
(
/(\d+)\.(\d+)\.(\d+)/
)
VersionInfo
.
new
(
m
[
1
].
to_i
,
m
[
2
].
to_i
,
m
[
3
].
to_i
)
else
VersionInfo
.
new
...
...
This diff is collapsed.
Click to expand it.
lib/tasks/gitlab/check.rake
View file @
9a0e7c0e
...
...
@@ -661,7 +661,7 @@ namespace :gitlab do
current_version
=
Gitlab
::
VersionInfo
.
parse
(
gitlab_shell_version
)
print
"GitLab Shell version >=
#{
required_version
}
? ... "
if
required_version
<=
current_version
if
current_version
.
valid?
&&
required_version
<=
current_version
puts
"OK (
#{
current_version
}
)"
.
green
else
puts
"FAIL. Please update gitlab-shell to
#{
required_version
}
from
#{
current_version
}
"
.
red
...
...
@@ -675,7 +675,7 @@ namespace :gitlab do
puts
"Your git bin path is
\"
#{
Gitlab
.
config
.
git
.
bin_path
}
\"
"
print
"Git version >=
#{
required_version
}
? ... "
if
required_version
<=
current_version
if
current_version
.
valid?
&&
required_version
<=
current_version
puts
"yes (
#{
current_version
}
)"
.
green
else
puts
"no"
.
red
...
...
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