blob: 29e30245dce4b5f0ee073474541b00267e142aae (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
# frozen_string_literal: true
module DiffFileConflictType
extend ActiveSupport::Concern
include Gitlab::Utils::StrongMemoize
included do
expose :conflict_type do |diff_file, options|
conflict_file = conflict_file(options, diff_file)
next unless conflict_file
conflict_file.conflict_type(diff_file)
end
end
private
def conflict_file(options, diff_file)
strong_memoize(:conflict_file) do
options[:conflicts] && options[:conflicts][diff_file.new_path]
end
end
end
|
