summaryrefslogtreecommitdiff
path: root/lib/api/branches.rb
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-12-30 13:36:13 +0100
committerMarin Jankovski <maxlazio@gmail.com>2014-12-30 13:37:14 +0100
commit7fa80b5bd01caff61c08c70b052c9965893cce5a (patch)
tree16c2d931e473818edcba13f4d7ae0b0c02ac8c83 /lib/api/branches.rb
parent0991d19c0d157025db8e9bf01d216771a4dbfe31 (diff)
downloadgitlab-ce-7fa80b5bd01caff61c08c70b052c9965893cce5a.tar.gz
Update branch api not found messages to 'Branch not found'.
Diffstat (limited to 'lib/api/branches.rb')
-rw-r--r--lib/api/branches.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb
index 6ec1a753a69..b52d786e020 100644
--- a/lib/api/branches.rb
+++ b/lib/api/branches.rb
@@ -14,7 +14,8 @@ module API
# Example Request:
# GET /projects/:id/repository/branches
get ":id/repository/branches" do
- present user_project.repository.branches.sort_by(&:name), with: Entities::RepoObject, project: user_project
+ branches = user_project.repository.branches.sort_by(&:name)
+ present branches, with: Entities::RepoObject, project: user_project
end
# Get a single branch
@@ -26,7 +27,7 @@ module API
# GET /projects/:id/repository/branches/:branch
get ':id/repository/branches/:branch', requirements: { branch: /.*/ } do
@branch = user_project.repository.branches.find { |item| item.name == params[:branch] }
- not_found!("Branch does not exist") if @branch.nil?
+ not_found!("Branch") unless @branch
present @branch, with: Entities::RepoObject, project: user_project
end
@@ -43,7 +44,7 @@ module API
authorize_admin_project
@branch = user_project.repository.find_branch(params[:branch])
- not_found! unless @branch
+ not_found!("Branch") unless @branch
protected_branch = user_project.protected_branches.find_by(name: @branch.name)
user_project.protected_branches.create(name: @branch.name) unless protected_branch
@@ -63,7 +64,7 @@ module API
authorize_admin_project
@branch = user_project.repository.find_branch(params[:branch])
- not_found! unless @branch
+ not_found!("Branch does not exist") unless @branch
protected_branch = user_project.protected_branches.find_by(name: @branch.name)
protected_branch.destroy if protected_branch