JENKINS-33836 deletion of MR projects when merge_to triggering is dis…

…abled
jenkinsci · Mar 27, 2016 · 644b336 · 644b336
1 parent a0beeee
commit 644b336
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/models/use_cases/process_merge_request.rb b/models/use_cases/process_merge_request.rb
@@ -19,7 +19,7 @@ def with(details, candidates)
         return [ 'No merge-request project candidates'] unless candidates
 
         candidates.select! do |project|
-          project.matches?(details, details.branch, true) && project.merge_to?(details.target_branch)
+          project.matches?(details, details.branch, true) && project.merge_to?(details.target_branch, true)
         end
 
         case details.state

diff --git a/models/values/project.rb b/models/values/project.rb
@@ -77,8 +77,8 @@ def pre_build_merge?
       pre_build_merge ? true : false
     end
 
-    def merge_to?(branch)
-      return false unless settings.merged_branch_triggering? && pre_build_merge?
+    def merge_to?(branch, is_mr = false)
+      return false unless ( is_mr || settings.merged_branch_triggering? ) && pre_build_merge?
       merge_params = pre_build_merge.get_options
       merge_params.merge_target == branch
     end