Merge branch 'da-remove-check-file-store-being-null' into 'master'

Geo - Improve query to retrieve Job Artifacts, LFS Objects, and Uploads with files stored locally

See merge request gitlab-org/gitlab!24891

ee/app/models/concerns/object_storable.rb

@@ -4,7 +4,7 @@ module ObjectStorable
   extend ActiveSupport::Concern
 
   included do
-    scope :with_files_stored_locally, -> { where(klass::STORE_COLUMN => [nil, ObjectStorage::Store::LOCAL]) }
+    scope :with_files_stored_locally, -> { where(klass::STORE_COLUMN => ObjectStorage::Store::LOCAL) }
     scope :with_files_stored_remotely, -> { where(klass::STORE_COLUMN => ObjectStorage::Store::REMOTE) }
   end
 end

ee/app/models/ee/lfs_object.rb

@@ -11,8 +11,6 @@ module EE
     STORE_COLUMN = :file_store
 
     prepended do
-      include ObjectStorable
-
       after_destroy :log_geo_deleted_event
 
       scope :project_id_in, ->(ids) { joins(:projects).merge(::Project.id_in(ids)) }

ee/changelogs/unreleased/da-remove-check-file-store-being-null.yml

+---
+title: Geo - Improve query to retrieve Job Artifacts, LFS Objects, and Uploads with
+  files stored locally
+merge_request: 24891
+author:
+type: performance