diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/serializers/concerns | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/serializers/concerns')
-rw-r--r-- | app/serializers/concerns/diff_file_conflict_type.rb | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/app/serializers/concerns/diff_file_conflict_type.rb b/app/serializers/concerns/diff_file_conflict_type.rb new file mode 100644 index 00000000000..29e30245dce --- /dev/null +++ b/app/serializers/concerns/diff_file_conflict_type.rb @@ -0,0 +1,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 |