diff options
| author | Zevs <vsv2711@gmail.com> | 2012-06-05 00:08:41 +0300 |
|---|---|---|
| committer | Zevs <vsv2711@gmail.com> | 2012-06-05 00:11:07 +0300 |
| commit | d6ed9920d68691472fe9f9a9247508573c64bae4 (patch) | |
| tree | 12210fe3ee74d43fdafadf635f71cb55a36b2085 /app/models/merge_request.rb | |
| parent | 3b41b1839b36b1063674af6acc659e43a97c8c39 (diff) | |
| download | gitlab-ce-d6ed9920d68691472fe9f9a9247508573c64bae4.tar.gz | |
#888 prevent to remove source_branch
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index fed761a6d5b..2aba24bc46f 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -189,7 +189,7 @@ class MergeRequest < ActiveRecord::Base self.merge!(current_user.id) true end - rescue + rescue self.mark_as_unmergable false end |