Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-18 13:40:45 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-18 13:40:45 +0400
commit3c742dad27d298fae9aa8ee68cf1a83178fb8704 (patch)
tree20f81fa1fd56643a7db2dcb7e131f0f54050522a /lib/api/api.rb
parent87a449f264684551d0b9cdfa9ed2d32f21110adb (diff)
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/api.rb')
-rw-r--r--lib/api/api.rb2
1 files changed, 2 insertions, 0 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