Commit 864f17cf authored by Sean McGivern's avatar Sean McGivern

Merge branch 'turn-on-merged-branch-cache-flag' into 'master'

Enable merged branch names flag by default

See merge request gitlab-org/gitlab!24986
parents 9624b36a e4e517f2
...@@ -919,7 +919,7 @@ class Repository ...@@ -919,7 +919,7 @@ class Repository
# This is only used in a few places, notably app/services/branches/delete_merged_service.rb, # 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 # and it could potentially result in a very large cache/performance issues with the current
# implementation. # implementation.
skip_cache = branch_names.empty? || Feature.disabled?(:merged_branch_names_redis_caching) 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 return raw_repository.merged_branch_names(branch_names) if skip_cache
cache = redis_hash_cache cache = redis_hash_cache
......
---
title: Cache repository merged branch names by default
merge_request: 24986
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