kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'cache-diff-size-limits' into 'master'

Browse source 
Only look up diff size limit flags once per request

See merge request !12048
This commit is contained in:
Douwe Maan 2017-06-09 20:16:58 +00:00
commit e4038cb508
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/gitlab/git/diff.rb
View file

@ -23,6 +23,23 @@ module Gitlab
class << self
# The maximum size of a diff to display.
def size_limit
if RequestStore.active?
RequestStore['gitlab_git_diff_size_limit'] ||= find_size_limit
else
find_size_limit
end
end
# The maximum size before a diff is collapsed.
def collapse_limit
if RequestStore.active?
RequestStore['gitlab_git_diff_collapse_limit'] ||= find_collapse_limit
else
find_collapse_limit
end
end
def find_size_limit
if Feature.enabled?('gitlab_git_diff_size_limit_increase')
200.kilobytes
else
@ -30,8 +47,7 @@ module Gitlab
end
end
# The maximum size before a diff is collapsed.
def collapse_limit
def find_collapse_limit
if Feature.enabled?('gitlab_git_diff_size_limit_increase')
100.kilobytes
else