1 files changed, 17 insertions, 0 deletions
diff --git a/app/finders/ci/runners_finder.rb b/app/finders/ci/runners_finder.rb
index 331f732bff7..945d332ff47 100644
--- a/app/finders/ci/runners_finder.rb
+++ b/app/finders/ci/runners_finder.rb
@@ -20,6 +20,8 @@ module Ci
       filter_by_upgrade_status!
       filter_by_runner_type!
       filter_by_tag_list!
+      filter_by_creator_id!
+      filter_by_version_prefix!
       sort!
       request_tag_list!
 
@@ -113,6 +115,21 @@ module Ci
       end
     end
 
+    def filter_by_creator_id!
+      creator_id = @params[:creator_id]
+      @runners = @runners.with_creator_id(creator_id) if creator_id.present?
+    end
+
+    def filter_by_version_prefix!
+      return @runners unless @params[:version_prefix]
+
+      sanitized_prefix = @params[:version_prefix][/^[\d+.]+/]
+
+      return @runners unless sanitized_prefix
+
+      @runners = @runners.with_version_prefix(sanitized_prefix)
+    end
+
     def sort!
       @runners = @runners.order_by(sort_key)
     end