Commit d5869aa3 authored by http://jneen.net/'s avatar http://jneen.net/

don't reload the merge request in render_approvals_json

it's already been done in the relevant service
parent 0fa3137a
...@@ -519,7 +519,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -519,7 +519,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def render_approvals_json def render_approvals_json
respond_to do |format| respond_to do |format|
format.json do format.json do
entity = API::Entities::MergeRequestApprovals.new(@merge_request.reload, current_user: current_user) entity = API::Entities::MergeRequestApprovals.new(@merge_request, current_user: current_user)
render json: entity render json: entity
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