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>

Fixed bug with json files content being escaped in api
3c742dad · Dmitriy Zaporozhets · 87a449f2 · 3c742dad · 3c742dad
Unverified Commit 3c742dad authored Feb 18, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

api.rb lib/api/api.rb +2 -0

repositories.rb lib/api/repositories.rb +1 -3

No files found.
--- 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

--- 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 'text/plain'
-        content_type blob.mime_type
        present blob.data
      end