diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-09 20:16:58 +0000 |
---|---|---|
committer | kushalpandya <kushal@gitlab.com> | 2017-06-13 11:33:33 +0530 |
commit | 2865d0c3da01ef84add236b2bb09c96ca726c87e (patch) | |
tree | 33f4ac8517daf96f74decefe618f6bc0af387cf4 | |
parent | df23ff949b8f852dccb002ecdf5d83f9999529fc (diff) | |
download | gitlab-ce-2865d0c3da01ef84add236b2bb09c96ca726c87e.tar.gz |
Merge branch 'cache-diff-size-limits' into 'master'
Only look up diff size limit flags once per request
See merge request !12048
-rw-r--r-- | lib/gitlab/git/diff.rb | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/lib/gitlab/git/diff.rb b/lib/gitlab/git/diff.rb index 8926aa19925..88ad760bea3 100644 --- a/lib/gitlab/git/diff.rb +++ b/lib/gitlab/git/diff.rb @@ -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 |