Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0229bafa
Commit
0229bafa
authored
Mar 05, 2020
by
Robert May
Committed by
Jarka Košanová
Mar 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove merged branch names flag
Removing the feature flag for the merged branch names cache.
parent
f96750dd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
app/models/repository.rb
app/models/repository.rb
+2
-4
changelogs/unreleased/remove-merged-branch-names-ff.yml
changelogs/unreleased/remove-merged-branch-names-ff.yml
+5
-0
No files found.
app/models/repository.rb
View file @
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
...
...
changelogs/unreleased/remove-merged-branch-names-ff.yml
0 → 100644
View file @
0229bafa
---
title
:
Improve performance of Repository#merged_branch_names
merge_request
:
26005
author
:
type
:
performance
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment