Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/version_check.rb b/lib/version_check.rb
index 35014f3ddf0..eddcddbeb49 100644
--- a/lib/version_check.rb
+++ b/lib/version_check.rb
@@ -69,13 +69,17 @@ class VersionCheck
 
     case response&.code
     when 200
-      response.body
+      Gitlab::Json.parse(response.body)
+    else
+      { error: 'version check failed', status: response&.code }
     end
   end
 
   def response
     with_reactive_cache do |data|
-      Gitlab::Json.parse(data) if data
+      raise InvalidateReactiveCache if data[:error]
+
+      data
     end
   end
 end