Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?

Signed-off-by: Rémy Coutable <remy@rymai.me>

Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?
Signed-off-by: Rémy Coutable <remy@rymai.me>
e78c701a · Rémy Coutable · ad937d27 · e78c701a
Commit e78c701a authored Nov 06, 2017 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

lib/api/entities.rb lib/api/entities.rb +1 -4

No files found.
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -242,10 +242,7 @@ module API
      end
      expose :merged do |repo_branch, options|
-        # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37442
+        options[:project].repository.merged_to_root_ref?(repo_branch, options[:merged_branch_names])
-        Gitlab::GitalyClient.allow_n_plus_1_calls do
-          options[:project].repository.merged_to_root_ref?(repo_branch.name, options[:merged_branch_names])
-        end
      end
      expose :protected do |repo_branch, options|