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
f915a4b8
Commit
f915a4b8
authored
Apr 06, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Warn when gitlab-shell version doesn't match requirement.
parent
45ca39e8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
CHANGELOG
CHANGELOG
+1
-0
config/initializers/5_backend.rb
config/initializers/5_backend.rb
+7
-0
lib/gitlab/backend/shell.rb
lib/gitlab/backend/shell.rb
+1
-1
No files found.
CHANGELOG
View file @
f915a4b8
...
@@ -62,6 +62,7 @@ v 7.10.0 (unreleased)
...
@@ -62,6 +62,7 @@ v 7.10.0 (unreleased)
- Project labels are now available over the API under the "tag_list" field (Cristian Medina)
- Project labels are now available over the API under the "tag_list" field (Cristian Medina)
- Fixed link paths for HTTP and SSH on the admin project view (Jeremy Maziarz)
- Fixed link paths for HTTP and SSH on the admin project view (Jeremy Maziarz)
- Fix and improve help rendering (Sullivan Sénéchal)
- Fix and improve help rendering (Sullivan Sénéchal)
- Warn when gitlab-shell version doesn't match requirement.
v 7.9.2
v 7.9.2
...
...
config/initializers/5_backend.rb
View file @
f915a4b8
...
@@ -6,3 +6,10 @@ require Rails.root.join("lib", "gitlab", "backend", "shell")
...
@@ -6,3 +6,10 @@ require Rails.root.join("lib", "gitlab", "backend", "shell")
# GitLab shell adapter
# GitLab shell adapter
require
Rails
.
root
.
join
(
"lib"
,
"gitlab"
,
"backend"
,
"shell_adapter"
)
require
Rails
.
root
.
join
(
"lib"
,
"gitlab"
,
"backend"
,
"shell_adapter"
)
required_version
=
Gitlab
::
VersionInfo
.
parse
(
Gitlab
::
Shell
.
version_required
)
current_version
=
Gitlab
::
VersionInfo
.
parse
(
Gitlab
::
Shell
.
new
.
version
)
unless
current_version
.
valid?
&&
required_version
<=
current_version
warn
"WARNING: This version of GitLab depends on gitlab-shell
#{
required_version
}
, but you're running
#{
current_version
}
. Please update gitlab-shell."
end
lib/gitlab/backend/shell.rb
View file @
f915a4b8
...
@@ -240,7 +240,7 @@ module Gitlab
...
@@ -240,7 +240,7 @@ module Gitlab
gitlab_shell_version_file
=
"
#{
gitlab_shell_path
}
/VERSION"
gitlab_shell_version_file
=
"
#{
gitlab_shell_path
}
/VERSION"
if
File
.
readable?
(
gitlab_shell_version_file
)
if
File
.
readable?
(
gitlab_shell_version_file
)
File
.
read
(
gitlab_shell_version_file
)
File
.
read
(
gitlab_shell_version_file
)
.
chomp
end
end
end
end
...
...
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