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/diff_file_entity.rb | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/serializers/diff_file_entity.rb')
| -rw-r--r-- | app/serializers/diff_file_entity.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/serializers/diff_file_entity.rb b/app/serializers/diff_file_entity.rb index b2a544e1125..7eca56b2f48 100644 --- a/app/serializers/diff_file_entity.rb +++ b/app/serializers/diff_file_entity.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true class DiffFileEntity < DiffFileBaseEntity + include DiffFileConflictType include CommitsHelper include IconsHelper include Gitlab::Utils::StrongMemoize @@ -88,10 +89,4 @@ class DiffFileEntity < DiffFileBaseEntity # If nothing is present, inline will be the default. options.fetch(:diff_view, :inline).to_sym end - - def conflict_file(options, diff_file) - strong_memoize(:conflict_file) do - options[:conflicts] && options[:conflicts][diff_file.new_path] - end - end end |