summaryrefslogtreecommitdiff
path: root/app/controllers/projects/commit_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-10-25 18:10:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-10-25 18:10:57 +0000
commit0351d9ed83635ce3258e2d09ba92b46a7cdcfa61 (patch)
treedd3c671fd8f618b87b9beeb7cf3a5b2ffa325253 /app/controllers/projects/commit_controller.rb
parentc59393a068f9d0113cc10ca8798d333d6a0e3d53 (diff)
downloadgitlab-ce-0351d9ed83635ce3258e2d09ba92b46a7cdcfa61.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
-rw-r--r--app/controllers/projects/commit_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 2b2764d2e34..870320a79d9 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -86,7 +86,7 @@ class Projects::CommitController < Projects::ApplicationController
respond_to do |format|
format.json do
- render json: @merge_requests.to_json
+ render json: Gitlab::Json.dump(@merge_requests)
end
end
end