diff options
| author | Saito <saitowu@gmail.com> | 2012-11-10 01:36:55 +0800 | 
|---|---|---|
| committer | Saito <saitowu@gmail.com> | 2012-11-10 01:36:55 +0800 | 
| commit | 6cec9ed3283a611a40b6df981ed00ccaa1bd0e73 (patch) | |
| tree | f654ef049e0eede4009d0e468e4856f65d4756c1 /lib/api/projects.rb | |
| parent | b664b784f16f5f0fca295af538483bb83c20f98f (diff) | |
| download | gitlab-ce-6cec9ed3283a611a40b6df981ed00ccaa1bd0e73.tar.gz | |
linguist will take care of this
Diffstat (limited to 'lib/api/projects.rb')
| -rw-r--r-- | lib/api/projects.rb | 14 | 
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 8f094e0c723..ac20bbeccab 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -147,7 +147,7 @@ module Gitlab          @hooks = paginate user_project.hooks          present @hooks, with: Entities::Hook        end -       +        # Get a project hook        #        # Parameters: @@ -159,7 +159,7 @@ module Gitlab          @hook = user_project.hooks.find(params[:hook_id])          present @hook, with: Entities::Hook        end -       +        # Add hook to project        # @@ -177,7 +177,7 @@ module Gitlab            error!({'message' => '404 Not found'}, 404)          end        end -       +        # Update an existing project hook        #        # Parameters: @@ -382,13 +382,7 @@ module Gitlab          tree = Tree.new commit.tree, user_project, ref, params[:filepath]          not_found! "File" unless tree.try(:tree) -        if tree.text? -          encoding = Gitlab::Encode.detect_encoding(tree.data) -          content_type encoding ? "text/plain; charset=#{encoding}" : "text/plain" -        else -          content_type tree.mime_type -        end - +        content_type tree.mime_type          present tree.data        end  | 
