Merge branch 'mk/dry-up-verification-state-include' into 'master'

Refactor Geo::VerifiableRegistry module

See merge request gitlab-org/gitlab!56175

doc/development/geo/framework.md

@@ -319,10 +319,7 @@ For example, to add support for files referenced by a `Widget` model with a
    # frozen_string_literal: true
 
    class Geo::WidgetRegistry < Geo::BaseRegistry
-     include Geo::ReplicableRegistry
-     # TODO: Include VerificationState in VerifiableRegistry
-     # https://gitlab.com/gitlab-org/gitlab/-/issues/298811
-     include ::Gitlab::Geo::VerificationState
+     include ::Geo::ReplicableRegistry
      include ::Geo::VerifiableRegistry
 
      MODEL_CLASS = ::Widget

ee/app/models/concerns/geo/verifiable_registry.rb

 # frozen_string_literal: true
 
-module Geo::VerifiableRegistry
+module Geo
+  module VerifiableRegistry
     extend ActiveSupport::Concern
+    include ::Gitlab::Geo::VerificationState
 
     class_methods do
       extend ::Gitlab::Utils::Override
@@ -77,4 +79,5 @@ module Geo::VerifiableRegistry
         verification_succeeded_with_checksum!(checksum, calculation_started_at)
       end
     end
+  end
 end

ee/app/models/geo/package_file_registry.rb

@@ -2,7 +2,6 @@
 
 class Geo::PackageFileRegistry < Geo::BaseRegistry
   include ::Geo::ReplicableRegistry
-  include ::Gitlab::Geo::VerificationState
   include ::Geo::VerifiableRegistry
 
   MODEL_CLASS = ::Packages::PackageFile