diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-08-11 20:50:35 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-08-11 20:50:35 +0800 |
| commit | 4f0fa13eb85994b747c1eb253e346b76b98b5c5b (patch) | |
| tree | f690c9013ce1653272d0a345cb4840a7e6336ec0 /lib | |
| parent | c62ae6cfd70d518386fdbcb9714d18ac4f5e8c31 (diff) | |
| download | gitlab-ce-4f0fa13eb85994b747c1eb253e346b76b98b5c5b.tar.gz | |
Show error message for API 500 error in tests, and
document have_gitlab_http_status
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/helpers.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 99b8b62691f..3582ed81b0f 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -257,7 +257,15 @@ module API message << " " << trace.join("\n ") API.logger.add Logger::FATAL, message - rack_response({ 'message' => '500 Internal Server Error' }.to_json, 500) + + response_message = + if Rails.env.test? + message + else + '500 Internal Server Error' + end + + rack_response({ 'message' => response_message }.to_json, 500) end # project helpers |