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

fix typo according to docs and tests

Browse source
This commit is contained in:
Nihad Abbasov 2012-08-01 05:48:15 -07:00
parent 00b280c3f9
commit 853ca74620
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/api/projects.rb
View file

@ -37,11 +37,11 @@ module Gitlab
# #
# Parameters: # Parameters:
# id (required) - The ID or code name of a project # id (required) - The ID or code name of a project
# branch_id (required) - The name of the branch # branch (required) - The name of the branch
# Example Request: # Example Request:
# GET /projects/:id/repository/branches/:branch_id # GET /projects/:id/repository/branches/:branch
get ":id/repository/branches/:branch_id" do get ":id/repository/branches/:branch" do
@branch = user_project.repo.heads.find { |item| item.name == params[:branch_id] } @branch = user_project.repo.heads.find { |item| item.name == params[:branch] }
present @branch, :with => Entities::RepoObject present @branch, :with => Entities::RepoObject
end end
@ -148,7 +148,7 @@ module Gitlab
# #
# Parameters: # Parameters:
# id (required) - The ID or code name of a project # id (required) - The ID or code name of a project
# sha (required) - The commit or branch name # sha (required) - The commit or branch name
# filepath (required) - The path to the file to display # filepath (required) - The path to the file to display
# Example Request: # Example Request:
# GET /projects/:id/repository/commits/:sha/blob # GET /projects/:id/repository/commits/:sha/blob
@ -157,10 +157,10 @@ module Gitlab
commit = user_project.commit ref commit = user_project.commit ref
error!('404 Commit Not Found', 404) unless commit error!('404 Commit Not Found', 404) unless commit
tree = Tree.new commit.tree, user_project, ref, params[:filepath] tree = Tree.new commit.tree, user_project, ref, params[:filepath]
error!('404 File Not Found', 404) unless tree.try(:tree) error!('404 File Not Found', 404) unless tree.try(:tree)
if tree.text? if tree.text?
encoding = Gitlab::Encode.detect_encoding(tree.data) encoding = Gitlab::Encode.detect_encoding(tree.data)
content_type encoding ? "text/plain; charset=#{encoding}" : "text/plain" content_type encoding ? "text/plain; charset=#{encoding}" : "text/plain"