Commit d9e8e9b2 authored by Jarka Košanová's avatar Jarka Košanová

Merge branch 'remove-merged-branch-names-ff' into 'master'

Remove merged branch names flag

Closes #201906

See merge request gitlab-org/gitlab!26005
parents ebaaefc3 0229bafa
......@@ -911,10 +911,8 @@ class Repository
def merged_branch_names(branch_names = [])
# Currently we should skip caching if requesting all branch names
# This is only used in a few places, notably app/services/branches/delete_merged_service.rb,
# and it could potentially result in a very large cache/performance issues with the current
# implementation.
skip_cache = branch_names.empty? || Feature.disabled?(:merged_branch_names_redis_caching, default_enabled: true)
return raw_repository.merged_branch_names(branch_names) if skip_cache
# and it could potentially result in a very large cache.
return raw_repository.merged_branch_names(branch_names) if branch_names.empty?
cache = redis_hash_cache
......
---
title: Improve performance of Repository#merged_branch_names
merge_request: 26005
author:
type: performance
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment