diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 15:08:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 15:08:54 +0000 |
| commit | 11e5d1b9ca3efa7be34ddebb708a6aedb4e91639 (patch) | |
| tree | 999fdffb9d3db2e5200994e289e50fa3a3a1684a /app/models/merge_request.rb | |
| parent | 7351a484d79236b7e9d47c86f2fcc970b7ae10b0 (diff) | |
| download | gitlab-ce-11e5d1b9ca3efa7be34ddebb708a6aedb4e91639.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 62f34ae6525..cf2763180c4 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -24,6 +24,7 @@ class MergeRequest < ApplicationRecord self.reactive_cache_key = ->(model) { [model.project.id, model.iid] } self.reactive_cache_refresh_interval = 10.minutes self.reactive_cache_lifetime = 10.minutes + self.reactive_cache_hard_limit = 20.megabytes SORTING_PREFERENCE_FIELD = :merge_requests_sort |