diff options
Diffstat (limited to 'lib/api/entities/merge_request_basic.rb')
| -rw-r--r-- | lib/api/entities/merge_request_basic.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/entities/merge_request_basic.rb b/lib/api/entities/merge_request_basic.rb index d5cf2f653db..55d58166590 100644 --- a/lib/api/entities/merge_request_basic.rb +++ b/lib/api/entities/merge_request_basic.rb @@ -3,9 +3,13 @@ module API module Entities class MergeRequestBasic < IssuableEntity + # Deprecated in favour of merge_user expose :merged_by, using: Entities::UserBasic do |merge_request, _options| merge_request.metrics&.merged_by end + expose :merge_user, using: Entities::UserBasic do |merge_request| + merge_request.metrics&.merged_by || merge_request.merge_user + end expose :merged_at do |merge_request, _options| merge_request.metrics&.merged_at end |