From 077799963c59ad79259baab07e58e1ba57b61d7c Mon Sep 17 00:00:00 2001
From: Marius BALTEANU <marius.balteanu@zitec.com>
Date: Tue, 30 Mar 2021 12:17:52 +0300
Subject: [PATCH 15/19] Fix detach attachments when a conflict occurs (#29914,
 #32923)

---
 app/controllers/issues_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index f45d9bf06..c994862e1 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -189,6 +189,7 @@ class IssuesController < ApplicationController
     begin
       saved = save_issue_with_child_records
     rescue ActiveRecord::StaleObjectError
+      @issue.detach_saved_attachments
       @conflict = true
       if params[:last_journal_id]
         @conflict_journals = @issue.journals_after(params[:last_journal_id]).to_a
-- 
2.22.0