ruby/proto/gitaly/conflicts_services_pb.rb in gitaly-14.1.0.pre.rc4 vs ruby/proto/gitaly/conflicts_services_pb.rb in gitaly-14.2.0.pre.rc1

@@ -6,20 +6,20 @@
 
 module Gitaly
   module ConflictsService
     class Service
 
-      include GRPC::GenericService
+      include ::GRPC::GenericService
 
       self.marshal_class_method = :encode
       self.unmarshal_class_method = :decode
       self.service_name = 'gitaly.ConflictsService'
 
-      rpc :ListConflictFiles, Gitaly::ListConflictFilesRequest, stream(Gitaly::ListConflictFilesResponse)
+      rpc :ListConflictFiles, ::Gitaly::ListConflictFilesRequest, stream(::Gitaly::ListConflictFilesResponse)
       # ResolveConflicts tries to resolve a conflicting merge with a set of
       # user-provided merge resolutions. If resolving the conflict succeeds, the
       # result will be a new merge commit.
-      rpc :ResolveConflicts, stream(Gitaly::ResolveConflictsRequest), Gitaly::ResolveConflictsResponse
+      rpc :ResolveConflicts, stream(::Gitaly::ResolveConflictsRequest), ::Gitaly::ResolveConflictsResponse
     end
 
     Stub = Service.rpc_stub_class
   end
 end