[refs #90] final fix to merge

2012-09-28 20:31:21 +06:00 · 2012-09-28 20:31:21 +06:00 · 8cb9171c17
parent 0069dfffc7
commit 8cb9171c17
1 changed files with 1 additions and 1 deletions
--- a/app/models/pull_request.rb
+++ b/app/models/pull_request.rb
@ -54,7 +54,7 @@ class PullRequest < ActiveRecord::Base
    new_status = case res
                 when /Already up-to-date/
                   'already'
-                 when /Merge made by the 'recursive' strategy/
+                 when /Merge made by/
                   system("cd #{path} && git reset --hard HEAD^") # remove merge commit
                   'ready'
                 when /Automatic merge failed/