Deprecate diverging commit count with max parameter

In 12.0, we turned the feature flag on that effectively turned off the
--max-count flag for the count diverging commits call. Since we have
commit graphs turned on, this did not affect preformance negatively.
Thus, we want to deprecate the call that passes --max-count

3 files changed, 1 insertions, 32 deletions

diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb
index eadf48205fc..c759882d7f8 100644
--- a/app/helpers/branches_helper.rb
+++ b/app/helpers/branches_helper.rb
@@ -8,12 +8,4 @@ module BranchesHelper
   def protected_branch?(project, branch)
     ProtectedBranch.protected?(project, branch.name)
   end
-
-  def diverging_count_label(count)
-    if count >= Repository::MAX_DIVERGING_COUNT
-      "#{Repository::MAX_DIVERGING_COUNT - 1}+"
-    else
-      count.to_s
-    end
-  end
 end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 992ed7485e5..d087a5a7bbd 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -6,7 +6,6 @@ class Repository
   REF_MERGE_REQUEST = 'merge-requests'.freeze
   REF_KEEP_AROUND = 'keep-around'.freeze
   REF_ENVIRONMENTS = 'environments'.freeze
-  MAX_DIVERGING_COUNT = 1000
 
   RESERVED_REFS_NAMES = %W[
     heads
diff --git a/app/services/branches/diverging_commit_counts_service.rb b/app/services/branches/diverging_commit_counts_service.rb
index f947cec1663..a3404caf2d7 100644
--- a/app/services/branches/diverging_commit_counts_service.rb
+++ b/app/services/branches/diverging_commit_counts_service.rb
@@ -8,11 +8,7 @@ module Branches
     end
 
     def call(branch)
-      if Feature.enabled?('gitaly_count_diverging_commits_no_max')
-        diverging_commit_counts_without_max(branch)
-      else
-        diverging_commit_counts(branch)
-      end
+      diverging_commit_counts(branch)
     end
 
     private
@@ -22,27 +18,9 @@ module Branches
     delegate :raw_repository, to: :repository
 
     def diverging_commit_counts(branch)
-      ## TODO: deprecate the below code after 12.0
       @root_ref_hash ||= raw_repository.commit(repository.root_ref).id
       cache.fetch(:"diverging_commit_counts_#{branch.name}") do
         number_commits_behind, number_commits_ahead =
-          repository.raw_repository.diverging_commit_count(
-            @root_ref_hash,
-            branch.dereferenced_target.sha,
-            max_count: Repository::MAX_DIVERGING_COUNT)
-
-        if number_commits_behind + number_commits_ahead >= Repository::MAX_DIVERGING_COUNT
-          { distance: Repository::MAX_DIVERGING_COUNT }
-        else
-          { behind: number_commits_behind, ahead: number_commits_ahead }
-        end
-      end
-    end
-
-    def diverging_commit_counts_without_max(branch)
-      @root_ref_hash ||= raw_repository.commit(repository.root_ref).id
-      cache.fetch(:"diverging_commit_counts_without_max_#{branch.name}") do
-        number_commits_behind, number_commits_ahead =
           raw_repository.diverging_commit_count(
             @root_ref_hash,
             branch.dereferenced_target.sha)