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

Status code 404 returned when retrieving non existent branch (issue #2922)

Browse source 
Accessing a repository branch that does not exist returns a 404 error instead
of 200 now. Added a test.
This commit is contained in:
Sebastian Ziebell 2013-02-08 17:04:08 +01:00
parent 2f0a75ab77
commit 40e7846f3e
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/api/projects.rb
View file

@ -230,6 +230,7 @@ module Gitlab
# GET /projects/:id/repository/branches/:branch # GET /projects/:id/repository/branches/:branch
get ":id/repository/branches/:branch" do get ":id/repository/branches/:branch" do
@branch = user_project.repo.heads.find { |item| item.name == params[:branch] } @branch = user_project.repo.heads.find { |item| item.name == params[:branch] }
error!("Branch does not exist", 404) if @branch.nil?
present @branch, with: Entities::RepoObject, project: user_project present @branch, with: Entities::RepoObject, project: user_project
end end

5
spec/requests/api/projects_spec.rb
View file

@ -109,6 +109,11 @@ describe Gitlab::API do
json_response['commit']['id'].should == '621491c677087aa243f165eab467bfdfbee00be1' json_response['commit']['id'].should == '621491c677087aa243f165eab467bfdfbee00be1'
json_response['protected'].should == false json_response['protected'].should == false
end end
it "should return a 404 error if branch is not available" do
get api("/projects/#{project.id}/repository/branches/unknown", user)
response.status.should == 404
end
end end
describe "PUT /projects/:id/repository/branches/:branch/protect" do describe "PUT /projects/:id/repository/branches/:branch/protect" do