diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-11 08:47:04 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-11 08:47:04 +0200 |
| commit | 7e6dcf9cd0626c6d0cbbe96ae5327048d2c6849f (patch) | |
| tree | 33f22befc61e52178098bf77e57bba7a96aaae86 /lib/ci/api/api.rb | |
| parent | dccf8a9fc8d4dde91942944f6b47387bfb13c380 (diff) | |
| parent | 98d8e3fe9ff4d120469378490c41381ae751597e (diff) | |
| download | gitlab-ce-7e6dcf9cd0626c6d0cbbe96ae5327048d2c6849f.tar.gz | |
Merge branch 'master' into awardables
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 |