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 /config | |
| 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 'config')
| -rw-r--r-- | config/initializers/5_backend.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/initializers/5_backend.rb b/config/initializers/5_backend.rb index 7c2e7f39000..80d641d73a3 100644 --- a/config/initializers/5_backend.rb +++ b/config/initializers/5_backend.rb @@ -6,3 +6,10 @@ require Rails.root.join("lib", "gitlab", "backend", "shell") # GitLab 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 |