Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 1 insertions, 10 deletions

diff --git a/lib/gitlab/gitaly_client/with_feature_flag_actors.rb b/lib/gitlab/gitaly_client/with_feature_flag_actors.rb
index 92fc524b724..3d81292da16 100644
--- a/lib/gitlab/gitaly_client/with_feature_flag_actors.rb
+++ b/lib/gitlab/gitaly_client/with_feature_flag_actors.rb
@@ -16,8 +16,6 @@ module Gitlab
       # gitaly_client_call performs Gitaly calls including collected feature flag actors. The actors are retrieved
       # from repository actor and memoized. The service must set `self.repository_actor = a_repository` beforehand.
       def gitaly_client_call(*args, **kargs)
-        return GitalyClient.call(*args, **kargs) unless actors_aware_gitaly_calls?
-
         unless repository_actor
           Gitlab::ErrorTracking.track_and_raise_for_dev_exception(
             Feature::InvalidFeatureFlagError.new("gitaly_client_call called without setting repository_actor")
@@ -34,11 +32,8 @@ module Gitlab
         end
       end
 
-      # gitaly_feature_flag_actors returns a hash of actors implied from input repository. If actors_aware_gitaly_calls
-      # flag is not on, this method returns an empty hash.
+      # gitaly_feature_flag_actors returns a hash of actors implied from input repository.
       def gitaly_feature_flag_actors(repository)
-        return {} unless actors_aware_gitaly_calls?
-
         container = find_repository_container(repository)
         {
           repository: repository,
@@ -92,10 +87,6 @@ module Gitlab
           repository.container
         end
       end
-
-      def actors_aware_gitaly_calls?
-        Feature.enabled?(:actors_aware_gitaly_calls)
-      end
     end
   end
 end