Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d5869aa3
Commit
d5869aa3
authored
Dec 19, 2016
by
http://jneen.net/
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't reload the merge request in render_approvals_json
it's already been done in the relevant service
parent
0fa3137a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-1
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
d5869aa3
...
...
@@ -519,7 +519,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def
render_approvals_json
respond_to
do
|
format
|
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
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment