Merge branch 'bug/blob_escaped_json' into 'master'

Fixed bug with json files content being escaped in api Fixes #1035

Merge branch 'bug/blob_escaped_json' into 'master'
Fixed bug with json files content being escaped in api Fixes #1035
Dmitriy Zaporozhets
2 parents 87a449f2 3c742dad
Showing 2 changed files with 3 additions and 3 deletions Show diff stats
lib/api/api.rb
lib/api/repositories.rb
@@ -22,6 +22,8 @@ module API
     end
  
     format :json
+    content_type :txt, "text/plain"
+
     helpers APIHelpers
  
     mount Groups
@@ -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
...	...	@@ -22,6 +22,8 @@ module API
22	22	end
23	23
24	24	format :json
	25	+ content_type :txt, "text/plain"
	26	+
25	27	helpers APIHelpers
26	28
27	29	mount Groups
...	...
...	...	@@ -167,9 +167,7 @@ module API
167	167	blob = Gitlab::Git::Blob.find(repo, commit.id, params[:filepath])
168	168	not_found! "File" unless blob
169	169
170		- env['api.format'] = :txt
171		-
172		- content_type blob.mime_type
	170	+ content_type 'text/plain'
173	171	present blob.data
174	172	end
175	173
...	...