Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 12 deletions

diff --git a/spec/uploaders/ci/secure_file_uploader_spec.rb b/spec/uploaders/ci/secure_file_uploader_spec.rb
index 4bac591704b..ec7bbf637a1 100644
--- a/spec/uploaders/ci/secure_file_uploader_spec.rb
+++ b/spec/uploaders/ci/secure_file_uploader_spec.rb
@@ -46,12 +46,6 @@ RSpec.describe Ci::SecureFileUploader do
     end
   end
 
-  describe '.background_upload_enabled?' do
-    it 'returns false' do
-      expect(described_class.background_upload_enabled?).to eq(false)
-    end
-  end
-
   describe '.default_store' do
     context 'when object storage is enabled' do
       it 'returns REMOTE' do
diff --git a/spec/uploaders/terraform/state_uploader_spec.rb b/spec/uploaders/terraform/state_uploader_spec.rb
index bd8e7fbc016..2c17edf4e67 100644
--- a/spec/uploaders/terraform/state_uploader_spec.rb
+++ b/spec/uploaders/terraform/state_uploader_spec.rb
@@ -72,12 +72,6 @@ RSpec.describe Terraform::StateUploader do
     end
   end
 
-  describe '.background_upload_enabled?' do
-    it 'returns false' do
-      expect(described_class.background_upload_enabled?).to eq(false)
-    end
-  end
-
   describe '.proxy_download_enabled?' do
     it 'returns true' do
       expect(described_class.proxy_download_enabled?).to eq(true)