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 | |
| parent | 3b41b1839b36b1063674af6acc659e43a97c8c39 (diff) | |
| download | gitlab-ce-d6ed9920d68691472fe9f9a9247508573c64bae4.tar.gz | |
#888 prevent to remove source_branch
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 2 | ||||
| -rw-r--r-- | app/models/project/repository_trait.rb | 4 | ||||
| -rw-r--r-- | app/views/merge_requests/show.html.haml | 5 |
3 files changed, 8 insertions, 3 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 diff --git a/app/models/project/repository_trait.rb b/app/models/project/repository_trait.rb index a759ead569c..2b9cf437bbc 100644 --- a/app/models/project/repository_trait.rb +++ b/app/models/project/repository_trait.rb @@ -114,5 +114,9 @@ module Project::RepositoryTrait def root_ref default_branch || "master" end + + def root_ref? branch + root_ref == branch + end end end diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index 9a804ee29e9..cfa74fc0a49 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -65,8 +65,9 @@ = form_for [:automerge, @project, @merge_request], :remote => true, :method => :get do |f| You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions %br - = check_box_tag :should_remove_source_branch - = label_tag :should_remove_source_branch, "Remove source-branch" + -unless @project.root_ref? @merge_request.source_branch + = check_box_tag :should_remove_source_branch + = label_tag :should_remove_source_branch, "Remove source-branch" = f.submit "Accept Merge Request", :class => "btn small info accept_merge_request" |