diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-03 17:54:33 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-03 17:54:33 -0800 |
| commit | 635ebac606d77eae03ce2e2a8f0a814ad4c79177 (patch) | |
| tree | 8f3047074880166e53edb987df8ba4295d374c3d /lib/api/api.rb | |
| parent | ac7af45d8987422c2a529d3d87eae6d9bd608e12 (diff) | |
| parent | 704922c855a9741b5495db56ac266788a9c25c33 (diff) | |
| download | gitlab-ce-635ebac606d77eae03ce2e2a8f0a814ad4c79177.tar.gz | |
Merge branch 'master' into mwessel/gitlab-ce-configure-protection
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index cb46f477ff9..60858a39407 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -6,7 +6,7 @@ module API version 'v3', using: :path rescue_from ActiveRecord::RecordNotFound do - rack_response({'message' => '404 Not found'}.to_json, 404) + rack_response({ 'message' => '404 Not found' }.to_json, 404) end rescue_from :all do |exception| @@ -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' }, 500) end format :json |