diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-06 16:46:37 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-06 16:46:37 +0000 |
| commit | 102b32325da3fc93a1c99d05b20c853fc681df35 (patch) | |
| tree | 749a47e40cc14aaeea1651e06b524edd8703b072 /app/models/merge_request.rb | |
| parent | d87d1e7901f7a71c6f0541c709be26fce3db7e4b (diff) | |
| parent | 856447ccd305832c4e9421ab9e81d63eea348203 (diff) | |
| download | gitlab-ce-102b32325da3fc93a1c99d05b20c853fc681df35.tar.gz | |
Merge branch 'throttle-touching-of-objects' into 'master'
Throttle the number of UPDATEs triggered by touch
Closes #34763
See merge request gitlab-org/gitlab-ce!15682
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 f2d639a3382..949d42f865c 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -7,6 +7,7 @@ class MergeRequest < ActiveRecord::Base include TimeTrackable include ManualInverseAssociation include EachBatch + include ThrottledTouch ignore_column :locked_at, :ref_fetched |