From af657b0509476db56e88014062ccf0a7a6b9d8b7 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 2 Apr 2013 11:32:41 +0300
Subject: [PATCH] reset st_commits before setting new value to prevent error
 when old st_commits is broken

---
 app/models/merge_request.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 8d378053..6ce94417 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -172,6 +172,12 @@ class MergeRequest < ActiveRecord::Base
 
   def reloaded_commits
     if opened? && unmerged_commits.any?
+      # we need to reset st_commits field first
+      # in order to prevent internal rails comparison
+      self.st_commits = []
+      save
+
+      # Then we can safely write unmerged commits
       self.st_commits = unmerged_commits
       save
     end