diff --git a/ee/lib/ee/api/entities/merge_request_approval_state_rule.rb b/ee/lib/ee/api/entities/merge_request_approval_state_rule.rb index 053a5ca3688d18ef8bdcdf66b5ef16fa2d534eb3..7dde02d2bfaa1e4e1b48d3fd5d3d1e8fa766bfc5 100644 --- a/ee/lib/ee/api/entities/merge_request_approval_state_rule.rb +++ b/ee/lib/ee/api/entities/merge_request_approval_state_rule.rb @@ -7,6 +7,8 @@ class MergeRequestApprovalStateRule < MergeRequestApprovalRule expose :code_owner expose :approved_approvers, as: :approved_by, using: ::API::Entities::UserBasic expose :approved?, as: :approved + + expose :approved_approvers, as: :commented_by, using: ::API::Entities::UserBasic end end end diff --git a/ee/spec/requests/api/merge_request_approvals_spec.rb b/ee/spec/requests/api/merge_request_approvals_spec.rb index 847ffbcb164c8244044341157521e32392c26b24..6aeb0298687c71a799cb7f74ccbcc6cf6f3d997b 100644 --- a/ee/spec/requests/api/merge_request_approvals_spec.rb +++ b/ee/spec/requests/api/merge_request_approvals_spec.rb @@ -174,6 +174,7 @@ expect(rule_response['name']).to eq('foo') expect(rule_response['approvers'][0]['username']).to eq(approver.username) expect(rule_response['approved_by'][0]['username']).to eq(approver.username) + expect(rule_response['commented_by'][0]['username']).to eq(approver.username) expect(rule_response['source_rule']).to be_nil expect(rule_response['section']).to be_nil end