From 1229fe8d8720564535c15644fa00a9d5b26ef43f Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Thu, 14 Dec 2017 13:27:00 +0000 Subject: Merge branch 'zj-mr-diff-memoization-bug' into 'master' Clear caches before updating MR diffs See merge request gitlab-org/gitlab-ce!15916 --- app/models/merge_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1