diff options
| author | LUKE BENNETT <lbennett@gitlab.com> | 2017-12-13 14:37:44 +0000 |
|---|---|---|
| committer | LUKE BENNETT <lbennett@gitlab.com> | 2017-12-13 14:37:44 +0000 |
| commit | f48e815c895792897a835a7cbbbc2f185a1cdebd (patch) | |
| tree | 4e2bae39e051eefe014dc95d1d58bf5aa949c27a | |
| parent | a0d03d5401d9569ad621202c992f3cc878050c08 (diff) | |
| download | gitlab-ce-f48e815c895792897a835a7cbbbc2f185a1cdebd.tar.gz | |
Fix merge_request.rb conflict resolution
| -rw-r--r-- | app/models/merge_request.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 26a3388602a..c342820eb2d 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -7,7 +7,6 @@ class MergeRequest < ActiveRecord::Base include TimeTrackable include ManualInverseAssociation include EachBatch - include ThrottledTouch include Gitlab::Utils::StrongMemoize ignore_column :locked_at, |