diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 11:40:45 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 11:40:45 +0200 |
| commit | 3c742dad27d298fae9aa8ee68cf1a83178fb8704 (patch) | |
| tree | 20f81fa1fd56643a7db2dcb7e131f0f54050522a /lib/api/repositories.rb | |
| parent | 87a449f264684551d0b9cdfa9ed2d32f21110adb (diff) | |
| download | gitlab-ce-3c742dad27d298fae9aa8ee68cf1a83178fb8704.tar.gz | |
Fixed bug with json files content being escaped in api
After update to recent grape env['api.format'] does not work any more.
Use content_type for rendering raw json files content
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/api/repositories.rb')
| -rw-r--r-- | lib/api/repositories.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb index cad64760abb..c305c889fc2 100644 --- a/lib/api/repositories.rb +++ b/lib/api/repositories.rb @@ -167,9 +167,7 @@ module API blob = Gitlab::Git::Blob.find(repo, commit.id, params[:filepath]) not_found! "File" unless blob - env['api.format'] = :txt - - content_type blob.mime_type + content_type 'text/plain' present blob.data end |