diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2016-04-07 09:21:04 +0300 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2016-04-07 09:21:04 +0300 |
| commit | f5fdf20d76c4b6fc648d6555a726ca1312a1ccbe (patch) | |
| tree | 6a9a8a6ec832237dfefe24d2881ea23c230ebad5 /lib | |
| parent | e684063b216e94b850f2c4af82f4a0670126e772 (diff) | |
| parent | 3e2c0f264ddda6d6c1c088ceb963a77b768c4852 (diff) | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'lib')
| -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 |