diff options
author | Robert Speicher <robert@gitlab.com> | 2017-06-28 21:28:02 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-06-28 21:28:02 +0000 |
commit | 6e37e69671e775b65977ebc3d61bd200f74fdaa2 (patch) | |
tree | b35a567d8810b061243ddf67c73b581bc89bdedf /config | |
parent | 9f44687a14d57fec596b9736584bf8718df75a2e (diff) | |
parent | b4e1529e57e28dade05e307c7a3ff508c2d54f50 (diff) | |
download | gitlab-ce-6e37e69671e775b65977ebc3d61bd200f74fdaa2.tar.gz |
Merge branch 'shell-test-rebuild' into 'master'
Reinstall shell on the test env if it's outdated
See merge request !12285
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/5_backend.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config/initializers/5_backend.rb b/config/initializers/5_backend.rb index 2bd159ca7f1..482613dacc9 100644 --- a/config/initializers/5_backend.rb +++ b/config/initializers/5_backend.rb @@ -1,6 +1,8 @@ -required_version = Gitlab::VersionInfo.parse(Gitlab::Shell.version_required) -current_version = Gitlab::VersionInfo.parse(Gitlab::Shell.new.version) +unless Rails.env.test? + 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." + 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 end |