diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-14 13:27:00 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-14 13:27:00 +0000 |
| commit | b0bc676f209257115a16a0ba6fa736a97693c6fe (patch) | |
| tree | 2100fa159f1b0eaafb07147da0cfabd99e7676d2 /app/models/merge_request.rb | |
| parent | 57175ecb5060dac145abc048b6e88642bc1aa82b (diff) | |
| parent | 8ad412559de71f3030fb4665ff1a8ddfb5211824 (diff) | |
| download | gitlab-ce-b0bc676f209257115a16a0ba6fa736a97693c6fe.tar.gz | |
Merge branch 'zj-mr-diff-memoization-bug' into 'master'
Clear caches before updating MR diffs
See merge request gitlab-org/gitlab-ce!15916
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index f627ce260a3..c39789b047d 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -53,8 +53,8 @@ class MergeRequest < ActiveRecord::Base serialize :merge_params, Hash # rubocop:disable Cop/ActiveRecordSerialize after_create :ensure_merge_request_diff, unless: :importing? - after_update :reload_diff_if_branch_changed after_update :clear_memoized_shas + after_update :reload_diff_if_branch_changed # When this attribute is true some MR validation is ignored # It allows us to close or modify broken merge requests |