Up grape version. Fix issue with raw content being escaped
This commit is contained in:
parent
e26d149cd8
commit
9351a295c1
3 changed files with 8 additions and 6 deletions
4
Gemfile
4
Gemfile
|
@ -41,8 +41,8 @@ gem "gitlab-gollum-lib", "~> 1.0.0", require: 'gollum-lib'
|
|||
gem "github-linguist", require: "linguist"
|
||||
|
||||
# API
|
||||
gem "grape", "~> 0.3.1"
|
||||
gem "grape-entity", "~> 0.2.0"
|
||||
gem "grape", "~> 0.4.1"
|
||||
gem "grape-entity", "~> 0.3.0"
|
||||
|
||||
# Format dates and times
|
||||
# based on human-friendly examples
|
||||
|
|
|
@ -173,7 +173,7 @@ GEM
|
|||
gon (4.1.0)
|
||||
actionpack (>= 2.3.0)
|
||||
json
|
||||
grape (0.3.1)
|
||||
grape (0.4.1)
|
||||
activesupport
|
||||
builder
|
||||
hashie (>= 1.2.0)
|
||||
|
@ -183,7 +183,7 @@ GEM
|
|||
rack-accept
|
||||
rack-mount
|
||||
virtus
|
||||
grape-entity (0.2.0)
|
||||
grape-entity (0.3.0)
|
||||
activesupport
|
||||
multi_json (>= 1.3.2)
|
||||
growl (1.0.3)
|
||||
|
@ -528,8 +528,8 @@ DEPENDENCIES
|
|||
gitlab_meta (= 5.0)
|
||||
gitlab_omniauth-ldap (= 1.0.2)
|
||||
gon
|
||||
grape
|
||||
grape-entity
|
||||
grape (~> 0.4.1)
|
||||
grape-entity (~> 0.3.0)
|
||||
growl
|
||||
guard-rspec
|
||||
guard-spinach
|
||||
|
|
|
@ -124,6 +124,8 @@ module API
|
|||
blob = Gitlab::Git::Blob.new(repo, commit.id, ref, params[:filepath])
|
||||
not_found! "File" unless blob.exists?
|
||||
|
||||
env['api.format'] = :txt
|
||||
|
||||
content_type blob.mime_type
|
||||
present blob.data
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue