Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 5 deletions

diff --git a/app/finders/ci/pipelines_finder.rb b/app/finders/ci/pipelines_finder.rb
index af7b23278a4..d9fe5c23a7e 100644
--- a/app/finders/ci/pipelines_finder.rb
+++ b/app/finders/ci/pipelines_finder.rb
@@ -119,11 +119,12 @@ module Ci
 
     # rubocop: disable CodeReuse/ActiveRecord
     def by_username(items)
-      if params[:username].present?
-        items.joins(:user).where(users: { username: params[:username] })
-      else
-        items
-      end
+      return items unless params[:username].present?
+
+      user_id = User.by_username(params[:username]).pluck_primary_key.first
+      return Ci::Pipeline.none unless user_id
+
+      items.where(user_id: user_id)
     end
     # rubocop: enable CodeReuse/ActiveRecord