diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 10:46:50 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 10:46:50 +0000 |
| commit | 26ebfa20f082214f3dbd5d5ca49957d8cc83d234 (patch) | |
| tree | 20f81fa1fd56643a7db2dcb7e131f0f54050522a | |
| parent | 87a449f264684551d0b9cdfa9ed2d32f21110adb (diff) | |
| parent | 3c742dad27d298fae9aa8ee68cf1a83178fb8704 (diff) | |
| download | gitlab-ce-26ebfa20f082214f3dbd5d5ca49957d8cc83d234.tar.gz | |
Merge branch 'bug/blob_escaped_json' into 'master'
Fixed bug with json files content being escaped in api
Fixes #1035
| -rw-r--r-- | lib/api/api.rb | 2 | ||||
| -rw-r--r-- | lib/api/repositories.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 283f7642f67..9022cf7375a 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -22,6 +22,8 @@ module API end format :json + content_type :txt, "text/plain" + helpers APIHelpers mount Groups 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 |