Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

2 files changed, 7 insertions, 7 deletions

diff --git a/lib/gitlab/application_rate_limiter/increment_per_action.rb b/lib/gitlab/application_rate_limiter/increment_per_action.rb
index c99d03f1344..a3343c8a97c 100644
--- a/lib/gitlab/application_rate_limiter/increment_per_action.rb
+++ b/lib/gitlab/application_rate_limiter/increment_per_action.rb
@@ -5,9 +5,9 @@ module Gitlab
     class IncrementPerAction < BaseStrategy
       def increment(cache_key, expiry)
         with_redis do |redis|
-          redis.pipelined do
-            redis.incr(cache_key)
-            redis.expire(cache_key, expiry)
+          redis.pipelined do |pipeline|
+            pipeline.incr(cache_key)
+            pipeline.expire(cache_key, expiry)
           end.first
         end
       end
diff --git a/lib/gitlab/application_rate_limiter/increment_per_actioned_resource.rb b/lib/gitlab/application_rate_limiter/increment_per_actioned_resource.rb
index 8b4197cfff9..7a68dd104a8 100644
--- a/lib/gitlab/application_rate_limiter/increment_per_actioned_resource.rb
+++ b/lib/gitlab/application_rate_limiter/increment_per_actioned_resource.rb
@@ -9,10 +9,10 @@ module Gitlab
 
       def increment(cache_key, expiry)
         with_redis do |redis|
-          redis.pipelined do
-            redis.sadd(cache_key, resource_key)
-            redis.expire(cache_key, expiry)
-            redis.scard(cache_key)
+          redis.pipelined do |pipeline|
+            pipeline.sadd(cache_key, resource_key)
+            pipeline.expire(cache_key, expiry)
+            pipeline.scard(cache_key)
           end.last
         end
       end