diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-28 18:03:34 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-28 18:03:34 +0200 |
| commit | 285cf3f772e9c091ea7a86f47f41011e8ca2c545 (patch) | |
| tree | 8f63b945e247cf82d6389683eea0f60ed9f6a6bc /lib/api/api.rb | |
| parent | 822ba95f75858a904d20779b0d27d7f5aee2d7b7 (diff) | |
| parent | 79d0b69345477fca94818a1c9d18b6a936e82189 (diff) | |
| download | gitlab-ce-285cf3f772e9c091ea7a86f47f41011e8ca2c545.tar.gz | |
Merge pull request #8677 from jubianchi/api-500-json
Send 500 errors as JSON in the API
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 2 |
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 |