Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 3 deletions

diff --git a/app/finders/ci/runners_finder.rb b/app/finders/ci/runners_finder.rb
index 4f9244d9825..774947a35b7 100644
--- a/app/finders/ci/runners_finder.rb
+++ b/app/finders/ci/runners_finder.rb
@@ -69,10 +69,15 @@ module Ci
     end
 
     def filter_by_upgrade_status!
-      return unless @params.key?(:upgrade_status)
-      return unless Ci::RunnerVersion.statuses.key?(@params[:upgrade_status])
+      upgrade_status = @params[:upgrade_status]
 
-      @runners = @runners.with_upgrade_status(@params[:upgrade_status])
+      return unless upgrade_status
+
+      unless Ci::RunnerVersion.statuses.key?(upgrade_status)
+        raise ArgumentError, "Invalid upgrade status value '#{upgrade_status}'"
+      end
+
+      @runners = @runners.with_upgrade_status(upgrade_status)
     end
 
     def filter_by_runner_type!