diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-06-19 17:06:17 -0400 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-06-19 17:06:17 -0400 |
| commit | b4e1529e57e28dade05e307c7a3ff508c2d54f50 (patch) | |
| tree | 7c741015a53536103cbcfc2736ca1f254e364e82 /config | |
| parent | e4eeba4e4b33c327d5c95a48103ab5781d15c77c (diff) | |
| download | gitlab-ce-b4e1529e57e28dade05e307c7a3ff508c2d54f50.tar.gz | |
Reinstall shell on the test env if it's outdatedshell-test-rebuild
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 |