Merge branch 'master' into fixes/api

2013-02-13 10:31:06 +01:00 · 2013-02-13 10:31:06 +01:00 · 375caeefcf
commit 375caeefcf
parent ae40e855ef b9f8b40190
29 changed files with 224 additions and 94 deletions
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@ -265,6 +265,7 @@ module Gitlab
      #   GET /projects/:id/repository/branches/:branch
      get ":id/repository/branches/:branch" do
        @branch = user_project.repo.heads.find { |item| item.name == params[:branch] }
+        not_found!("Branch does not exist") if @branch.nil?
        present @branch, with: Entities::RepoObject, project: user_project
      end