Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'

 Conflicts:
   app/models/ci/pipeline.rb

1 files changed, 3 insertions, 5 deletions

diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb
index ac70a99c2c5..5a961ac89e4 100644
--- a/app/services/boards/issues/list_service.rb
+++ b/app/services/boards/issues/list_service.rb
@@ -63,7 +63,7 @@ module Boards
       def without_board_labels(issues)
         return issues unless board_label_ids.any?
 
-        issues.where.not(issues_label_links.limit(1).arel.exists)
+        issues.where.not('EXISTS (?)', issues_label_links.limit(1))
       end
 
       def issues_label_links
@@ -71,10 +71,8 @@ module Boards
       end
 
       def with_list_label(issues)
-        issues.where(
-          LabelLink.where("label_links.target_type = 'Issue' AND label_links.target_id = issues.id")
-                   .where("label_links.label_id = ?", list.label_id).limit(1).arel.exists
-        )
+        issues.where('EXISTS (?)', LabelLink.where("label_links.target_type = 'Issue' AND label_links.target_id = issues.id")
+                                            .where("label_links.label_id = ?", list.label_id).limit(1))
       end
     end
   end