diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-14 13:27:00 +0000 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-19 14:05:11 -0200 |
| commit | 1229fe8d8720564535c15644fa00a9d5b26ef43f (patch) | |
| tree | 4725093c0983dd17e31940ebaac29e6789df749b | |
| parent | 1b65f905c7ee39624a7c0ed7c80428b85cb370e4 (diff) | |
| download | gitlab-ce-10-3-stable-prepare-rc3.tar.gz | |
Merge branch 'zj-mr-diff-memoization-bug' into 'master'10-3-stable-prepare-rc3
Clear caches before updating MR diffs
See merge request gitlab-org/gitlab-ce!15916
| -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 993006760f7..fb17ee96f03 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 |