From a8c1fc77ef58e4838a623569082cd08b80d95f85 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 30 Sep 2019 08:59:54 +0000 Subject: [PATCH] code cleanup: rubocop: fix Layout/EmptyLinesAroundBlockBody in app/models/attachment.rb git-svn-id: http://svn.redmine.org/redmine/trunk@18558 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 1 - app/models/attachment.rb | 5 ----- 2 files changed, 6 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index d8e0e1fc6..5408d3ea0 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -180,7 +180,6 @@ Layout/EmptyLinesAroundArguments: # SupportedStyles: empty_lines, no_empty_lines Layout/EmptyLinesAroundBlockBody: Exclude: - - 'app/models/attachment.rb' - 'app/models/setting.rb' - 'db/schema.rb' - 'lib/redmine/wiki_formatting/textile/redcloth3.rb' diff --git a/app/models/attachment.rb b/app/models/attachment.rb index a334024b4..29d1acc79 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -427,7 +427,6 @@ 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) @@ -435,14 +434,11 @@ class Attachment < ActiveRecord::Base self.id, self.disk_filename) .first existing.with_lock do - original_diskfile = self.diskfile existing_diskfile = existing.diskfile - if File.readable?(original_diskfile) && File.readable?(existing_diskfile) && FileUtils.identical?(original_diskfile, existing_diskfile) - self.update_columns disk_directory: existing.disk_directory, disk_filename: existing.disk_filename end @@ -459,7 +455,6 @@ class Attachment < ActiveRecord::Base # anymore, thats why this is caught and ignored as well. end - # Physically deletes the file from the file system def delete_from_disk! if disk_filename.present? && File.exist?(diskfile)