diff options
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index c342820eb2d..d7faf22fc46 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 Gitlab::Utils::StrongMemoize ignore_column :locked_at, :ref_fetched @@ -53,7 +52,6 @@ class MergeRequest < ActiveRecord::Base after_create :ensure_merge_request_diff, unless: :importing? after_update :reload_diff_if_branch_changed - after_update :clear_memoized_shas # When this attribute is true some MR validation is ignored # It allows us to close or modify broken merge requests @@ -388,17 +386,13 @@ class MergeRequest < ActiveRecord::Base end def source_branch_head - strong_memoize(:source_branch_head) do - if source_project && source_branch_ref - source_project.repository.commit(source_branch_ref) - end - end + return unless source_project + + source_project.repository.commit(source_branch_ref) if source_branch_ref end def target_branch_head - strong_memoize(:target_branch_head) do - target_project.repository.commit(target_branch_ref) - end + target_project.repository.commit(target_branch_ref) end def branch_merge_base_commit @@ -530,13 +524,6 @@ class MergeRequest < ActiveRecord::Base end end - def clear_memoized_shas - @target_branch_sha = @source_branch_sha = nil - - clear_memoization(:source_branch_head) - clear_memoization(:target_branch_head) - end - def reload_diff_if_branch_changed if (source_branch_changed? || target_branch_changed?) && (source_branch_head && target_branch_head) |