diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-13 13:05:47 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-13 13:05:47 +0000 |
| commit | 7f04a4174ed4c6627e78c4dabae152fa0f264853 (patch) | |
| tree | 48999ec93931e3d2a290a61e2f8f4ff3953bb0ae /lib | |
| parent | 3092e7f86a32bc6e6378ca499aeab8b3fec156e8 (diff) | |
| parent | f915a4b80fdae28492e6c630534d8b66462f670a (diff) | |
| download | gitlab-ce-7f04a4174ed4c6627e78c4dabae152fa0f264853.tar.gz | |
Merge branch 'shell-version-warning' into 'master'
Warn when gitlab-shell version doesn't match requirement.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1791.
See merge request !495
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/backend/shell.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb index aabc7f1e69a..530f9d93de4 100644 --- a/lib/gitlab/backend/shell.rb +++ b/lib/gitlab/backend/shell.rb @@ -240,7 +240,7 @@ module Gitlab gitlab_shell_version_file = "#{gitlab_shell_path}/VERSION" if File.readable?(gitlab_shell_version_file) - File.read(gitlab_shell_version_file) + File.read(gitlab_shell_version_file).chomp end end |