summaryrefslogtreecommitdiff
path: root/app/uploaders
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-06-13 14:12:28 +0100
committerNick Thomas <nick@gitlab.com>2019-07-23 16:53:03 +0100
commit4aa76dddecc048cef24963323afe59f1c120cb72 (patch)
tree0a15518b73ee1646d09161954cbefb577d249138 /app/uploaders
parentd892e80bf0161b535389c91ccb53539e4f08d790 (diff)
downloadgitlab-ce-4aa76dddecc048cef24963323afe59f1c120cb72.tar.gz
Remove dead MySQL code
None of this code can be reached any more, so it can all be removed
Diffstat (limited to 'app/uploaders')
-rw-r--r--app/uploaders/records_uploads.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/app/uploaders/records_uploads.rb b/app/uploaders/records_uploads.rb
index 00b51f92b12..3b2a9d2f80e 100644
--- a/app/uploaders/records_uploads.rb
+++ b/app/uploaders/records_uploads.rb
@@ -23,15 +23,7 @@ module RecordsUploads
return unless model
return unless file && file.exists?
- # MySQL InnoDB may encounter a deadlock if a deletion and an
- # insert is in the same transaction due to its next-key locking
- # algorithm, so we need to skip the transaction.
- # https://gitlab.com/gitlab-org/gitlab-ce/issues/55161#note_131556351
- if Gitlab::Database.mysql?
- readd_upload
- else
- Upload.transaction { readd_upload }
- end
+ Upload.transaction { readd_upload }
end
def readd_upload