Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 7 deletions

diff --git a/lib/gitlab/counters/buffered_counter.rb b/lib/gitlab/counters/buffered_counter.rb
index e662dfeef1e..eb701e16d2a 100644
--- a/lib/gitlab/counters/buffered_counter.rb
+++ b/lib/gitlab/counters/buffered_counter.rb
@@ -31,9 +31,9 @@ module Gitlab
         end
       end
 
-      def increment(amount)
+      def increment(increment)
         result = redis_state do |redis|
-          redis.incrby(key, amount)
+          redis.incrby(key, increment.amount)
         end
 
         FlushCounterIncrementsWorker.perform_in(WORKER_DELAY, counter_record.class.name, counter_record.id, attribute)
@@ -45,7 +45,7 @@ module Gitlab
         result = redis_state do |redis|
           redis.pipelined do |pipeline|
             increments.each do |increment|
-              pipeline.incrby(key, increment)
+              pipeline.incrby(key, increment.amount)
             end
           end
         end
diff --git a/lib/gitlab/counters/legacy_counter.rb b/lib/gitlab/counters/legacy_counter.rb
index 98cf8853321..0d976eaa346 100644
--- a/lib/gitlab/counters/legacy_counter.rb
+++ b/lib/gitlab/counters/legacy_counter.rb
@@ -11,19 +11,19 @@ module Gitlab
         @current_value = counter_record.method(attribute).call
       end
 
-      def increment(amount)
-        updated = update_counter_record_attribute(amount)
+      def increment(increment)
+        updated = update_counter_record_attribute(increment.amount)
 
         if updated == 1
           counter_record.execute_after_commit_callbacks
-          @current_value += amount
+          @current_value += increment.amount
         end
 
         @current_value
       end
 
       def bulk_increment(increments)
-        total_increment = increments.sum
+        total_increment = increments.sum(&:amount)
 
         updated = update_counter_record_attribute(total_increment)