Commit 8d18e557 authored by Robert May's avatar Robert May

Add a basic placeholder field

Adds a basic `commented_by` field to the merge request
approvals data. This will be populated in a later
iteration.
parent 8449665f
...@@ -18,6 +18,10 @@ module API ...@@ -18,6 +18,10 @@ module API
expose :approved_by, using: ::API::Entities::Approvals do |merge_request| expose :approved_by, using: ::API::Entities::Approvals do |merge_request|
merge_request.approvals merge_request.approvals
end end
expose :commented_by, using: ::API::Entities::Approvals do |merge_request|
[]
end
end end
end end
end end
...@@ -21,7 +21,8 @@ RSpec.describe API::Entities::MergeRequestApprovals do ...@@ -21,7 +21,8 @@ RSpec.describe API::Entities::MergeRequestApprovals do
approved: true, approved: true,
approved_by: [{ approved_by: [{
user: API::Entities::UserBasic.new(user).as_json user: API::Entities::UserBasic.new(user).as_json
}] }],
commented_by: []
}) })
end end
...@@ -30,7 +31,8 @@ RSpec.describe API::Entities::MergeRequestApprovals do ...@@ -30,7 +31,8 @@ RSpec.describe API::Entities::MergeRequestApprovals do
user_has_approved: false, user_has_approved: false,
user_can_approve: true, user_can_approve: true,
approved: false, approved: false,
approved_by: [] approved_by: [],
commented_by: []
}) })
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment