Add latest changes from gitlab-org/gitlab@12-10-stable-ee

2 files changed, 2 insertions, 23 deletions

diff --git a/app/uploaders/records_uploads.rb b/app/uploaders/records_uploads.rb
index 427314a87bb..967fcdc704e 100644
--- a/app/uploaders/records_uploads.rb
+++ b/app/uploaders/records_uploads.rb
@@ -56,31 +56,10 @@ module RecordsUploads
         size: file.size,
         path: upload_path,
         model: model,
-        mount_point: mounted_as,
-        store: initial_store
+        mount_point: mounted_as
       )
     end
 
-    def initial_store
-      if immediately_remote_stored?
-        ::ObjectStorage::Store::REMOTE
-      else
-        ::ObjectStorage::Store::LOCAL
-      end
-    end
-
-    def immediately_remote_stored?
-      object_storage_available? && direct_upload_enabled?
-    end
-
-    def object_storage_available?
-      self.class.ancestors.include?(ObjectStorage::Concern)
-    end
-
-    def direct_upload_enabled?
-      self.class.object_store_enabled? && self.class.direct_upload_enabled?
-    end
-
     # Before removing an attachment, destroy any Upload records at the same path
     #
     # Called `before :remove`
diff --git a/app/uploaders/terraform/state_uploader.rb b/app/uploaders/terraform/state_uploader.rb
index 9c5ae8a8bdc..2306313fc82 100644
--- a/app/uploaders/terraform/state_uploader.rb
+++ b/app/uploaders/terraform/state_uploader.rb
@@ -12,7 +12,7 @@ module Terraform
     encrypt(key: :key)
 
     def filename
-      "#{model.id}.tfstate"
+      "#{model.uuid}.tfstate"
     end
 
     def store_dir