summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorjubianchi <contact@jubianchi.fr>2015-01-29 08:22:07 +0100
committerjubianchi <contact@jubianchi.fr>2015-04-27 21:27:02 +0200
commit79d0b69345477fca94818a1c9d18b6a936e82189 (patch)
tree2d024d1aadc256ed24c16eb201a2fc1839bb9923 /lib/api
parentfbb5a359fe1bb271a1068ba3c4ca68ca0234be4e (diff)
downloadgitlab-ce-79d0b69345477fca94818a1c9d18b6a936e82189.tar.gz
Send 500 errors as JSON in the API
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/api.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 60858a39407..d2a35c78fc1 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -19,7 +19,7 @@ module API
message << " " << trace.join("\n ")
API.logger.add Logger::FATAL, message
- rack_response({ 'message' => '500 Internal Server Error' }, 500)
+ rack_response({ 'message' => '500 Internal Server Error' }.to_json, 500)
end
format :json