diff options
| author | BaldinoF <baldinof@gmail.com> | 2016-04-17 18:17:27 +0200 |
|---|---|---|
| committer | BaldinoF <baldinof@gmail.com> | 2016-04-17 18:17:27 +0200 |
| commit | b04140a1e497c75a721bc4e5458907bf35a0a8b9 (patch) | |
| tree | 8005646150e1c6979061e56a30f661b18ec331c7 /lib/api/branches.rb | |
| parent | 3918fce5bd073e18addb7d1d4aaf3c81ce8150b0 (diff) | |
| parent | 5048064dc5e7ca30f65209c7ccd9fb90f9ac49db (diff) | |
| download | gitlab-ce-b04140a1e497c75a721bc4e5458907bf35a0a8b9.tar.gz | |
Merge branch 'master' into number_sign_for_external_issue_ref
Diffstat (limited to 'lib/api/branches.rb')
| -rw-r--r-- | lib/api/branches.rb | 2 |
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 |