diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 12:24:42 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 12:24:42 -0500 |
| commit | a45924348fca7eff4e26b3d9e47117b9fb3669ec (patch) | |
| tree | 17531b97fd4a26e4f530dc5d35c2962fc0ed4f06 /lib/ci/api/api.rb | |
| parent | b41ddf9c6977e311b5085de8467ab450aa81b71b (diff) | |
| parent | 832cdd3d516698d0e6a7257b3d94292819a0436a (diff) | |
| download | gitlab-ce-a45924348fca7eff4e26b3d9e47117b9fb3669ec.tar.gz | |
Merge remote-tracking branch 'origin/master' into issue_14904
Diffstat (limited to 'lib/ci/api/api.rb')
| -rw-r--r-- | lib/ci/api/api.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ci/api/api.rb b/lib/ci/api/api.rb index 4e85d2c3c74..353c4ddebf8 100644 --- a/lib/ci/api/api.rb +++ b/lib/ci/api/api.rb @@ -23,6 +23,8 @@ module Ci rack_response({ 'message' => '500 Internal Server Error' }, 500) end + content_type :txt, 'text/plain' + content_type :json, 'application/json' format :json helpers ::Ci::API::Helpers |