deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

linguist will take care of this

Browse source
This commit is contained in:
Saito 2012-11-10 01:36:55 +08:00
parent b664b784f1
commit 6cec9ed328
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/api/projects.rb
View file

@ -147,7 +147,7 @@ module Gitlab
@hooks = paginate user_project.hooks @hooks = paginate user_project.hooks
present @hooks, with: Entities::Hook present @hooks, with: Entities::Hook
end end
# Get a project hook # Get a project hook
# #
# Parameters: # Parameters:
@ -159,7 +159,7 @@ module Gitlab
@hook = user_project.hooks.find(params[:hook_id]) @hook = user_project.hooks.find(params[:hook_id])
present @hook, with: Entities::Hook present @hook, with: Entities::Hook
end end
# Add hook to project # Add hook to project
# #
@ -177,7 +177,7 @@ module Gitlab
error!({'message' => '404 Not found'}, 404) error!({'message' => '404 Not found'}, 404)
end end
end end
# Update an existing project hook # Update an existing project hook
# #
# Parameters: # Parameters:
@ -382,13 +382,7 @@ module Gitlab
tree = Tree.new commit.tree, user_project, ref, params[:filepath] tree = Tree.new commit.tree, user_project, ref, params[:filepath]
not_found! "File" unless tree.try(:tree) not_found! "File" unless tree.try(:tree)
if tree.text? content_type tree.mime_type
encoding = Gitlab::Encode.detect_encoding(tree.data)
content_type encoding ? "text/plain; charset=#{encoding}" : "text/plain"
else
content_type tree.mime_type
end
present tree.data present tree.data
end end