diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /app/serializers/merge_request_diff_entity.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/serializers/merge_request_diff_entity.rb')
-rw-r--r-- | app/serializers/merge_request_diff_entity.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/serializers/merge_request_diff_entity.rb b/app/serializers/merge_request_diff_entity.rb index aa0ac7d2a7e..e197c3d0fbb 100644 --- a/app/serializers/merge_request_diff_entity.rb +++ b/app/serializers/merge_request_diff_entity.rb @@ -6,13 +6,13 @@ class MergeRequestDiffEntity < Grape::Entity include MergeRequestsHelper expose :version_index do |merge_request_diff| - @merge_request_diffs = options[:merge_request_diffs] + merge_request_diffs = options[:merge_request_diffs] diff = options[:merge_request_diff] - next unless diff.present? - next unless @merge_request_diffs.size > 1 + next unless merge_request_diffs.include?(diff) + next unless merge_request_diffs.size > 1 - version_index(merge_request_diff) + merge_request_diffs.size - merge_request_diffs.index(merge_request_diff) end expose :created_at |