summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-03-17 13:32:44 +0000
committerGo MAEDA <maeda@farend.jp>2021-03-17 13:32:44 +0000
commit7c824702c282ac3ecc31f6eee18f459da218218a (patch)
tree8ca8b0ab2779f7e47fa9875a090ba7ef9237f64b
parent7e4f55759195fcf9af4ce97866ab0138843ae67b (diff)
downloadredmine-7c824702c282ac3ecc31f6eee18f459da218218a.tar.gz
redmine-7c824702c282ac3ecc31f6eee18f459da218218a.zip
Reverts r20654.
git-svn-id: http://svn.redmine.org/redmine/trunk@20811 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/attachment.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 2ecabb4fd..7bce5ded6 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -498,12 +498,12 @@ class Attachment < ActiveRecord::Base
def reuse_existing_file_if_possible
original_diskfile = nil
reused = with_lock do
- if existing = Attachment.
- where(digest: self.digest, filesize: self.filesize).
- where('id <> ? and disk_filename <> ?',
- self.id, self.disk_filename).
- order(:id).
- last
+ if existing = Attachment
+ .where(digest: self.digest, filesize: self.filesize)
+ .where('id <> ? and disk_filename <> ?',
+ self.id, self.disk_filename)
+ .order(:id)
+ .last
existing.with_lock do
original_diskfile = self.diskfile
existing_diskfile = existing.diskfile