summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/models/issue.rb15
1 files changed, 12 insertions, 3 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index e23b02647..8e131118c 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1891,9 +1891,18 @@ class Issue < ActiveRecord::Base
next if issue.project.nil? || issue.fixed_version.nil?
unless issue.project.shared_versions.include?(issue.fixed_version)
- issue.init_journal(User.current)
- issue.fixed_version = nil
- issue.save
+ retried = false
+ begin
+ issue.init_journal(User.current)
+ issue.fixed_version = nil
+ issue.save
+ rescue ActiveRecord::StaleObjectError
+ raise if retried
+
+ retried = true
+ issue.reload
+ retry
+ end
end
end
end