diff options
| author | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-15 18:49:28 +0200 |
|---|---|---|
| committer | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-15 18:49:28 +0200 |
| commit | cd80a9075f5f2b3150c909a6cd56e7c8f239bd51 (patch) | |
| tree | 58f0fba91c72ec86cc744f026d62d06050b20efa /lib/api/helpers.rb | |
| parent | 1d6ba597028142511af8c9863f81073278ccd927 (diff) | |
| parent | 97b768508c360d2ae767a559b5037fe464061440 (diff) | |
| download | gitlab-ce-cd80a9075f5f2b3150c909a6cd56e7c8f239bd51.tar.gz | |
Merge branch 'master' into sm-cherry-pick-list-commits-in-message
Diffstat (limited to 'lib/api/helpers.rb')
| -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 |