Merge branch 'master' of github.com:gitlabhq/gitlabhq

f5fdf20d · Robert Schilling · e684063b · 3e2c0f26 · f5fdf20d
Commit f5fdf20d authored Apr 07, 2016 by Robert Schilling
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/api/branches.rb lib/api/branches.rb +1 -1

No files found.
--- a/lib/api/branches.rb
+++ b/lib/api/branches.rb
@@ -64,7 +64,7 @@ module API
        authorize_admin_project
        @branch = user_project.repository.find_branch(params[:branch])
-        not_found!("Branch does not exist") unless @branch
+        not_found!("Branch") unless @branch
        protected_branch = user_project.protected_branches.find_by(name: @branch.name)
        protected_branch.destroy if protected_branch