summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-06 17:02:41 +0200
committerRémy Coutable <remy@rymai.me>2016-04-06 17:02:41 +0200
commit3e2c0f264ddda6d6c1c088ceb963a77b768c4852 (patch)
treea9b89d7aea30b5703c59dd485a9e1a3f50ba9247
parent74313988aca5de1e65940d311f0f87e9da1b93c2 (diff)
parentd023a8528713ab9ffd8a9fc034f752ab91442b24 (diff)
downloadgitlab-ce-3e2c0f264ddda6d6c1c088ceb963a77b768c4852.tar.gz
Merge pull request #10118 from yasserhussain1110/unprotect-branch-not-found-message
API: Change the argument of `not_found!` in `:id/repository/branches/:branch/unprotect`
-rw-r--r--lib/api/branches.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb
index 592100a7045..231840148d9 100644
--- 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