diff options
author | Sean McGivern <sean@gitlab.com> | 2017-06-09 13:12:27 +0100 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2017-06-09 17:21:27 +0100 |
commit | 9b42be02abfe7066963cb29e3271b2c2ec415354 (patch) | |
tree | 3a3847dc2fbbe224abf058a582d3f2cb34355545 /lib | |
parent | 8ce11fc388bc168368b1e0a65659bb45c76a4a08 (diff) | |
download | gitlab-ce-9b42be02abfe7066963cb29e3271b2c2ec415354.tar.gz |
Only look up diff size limit flags once per requestcache-diff-size-limits
Diffstat (limited to 'lib')
-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 |