Commit 6cec9ed3 authored by Saito's avatar Saito

linguist will take care of this

parent b664b784
...@@ -147,7 +147,7 @@ module Gitlab ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment