Merge branch '40781-os-to-ce-ee' into 'master'

40781 Port to EE

See merge request gitlab-org/gitlab-ee!5128

spec/uploaders/attachment_uploader_spec.rb

@@ -12,7 +12,6 @@ describe AttachmentUploader do
                   upload_path: %r[uploads/-/system/note/attachment/],
                   absolute_path: %r[#{CarrierWave.root}/uploads/-/system/note/attachment/]
 
-  # EE-specific
   context "object_store is REMOTE" do
     before do
       stub_uploads_object_storage

spec/uploaders/avatar_uploader_spec.rb

@@ -12,7 +12,6 @@ describe AvatarUploader do
                   upload_path: %r[uploads/-/system/user/avatar/],
                   absolute_path: %r[#{CarrierWave.root}/uploads/-/system/user/avatar/]
 
-  # EE-specific
   context "object_store is REMOTE" do
     before do
       stub_uploads_object_storage

spec/uploaders/namespace_file_uploader_spec.rb

@@ -14,7 +14,6 @@ describe NamespaceFileUploader do
                   upload_path: IDENTIFIER,
                   absolute_path: %r[#{CarrierWave.root}/uploads/-/system/namespace/\d+/#{IDENTIFIER}]
 
-  # EE-specific
   context "object_store is REMOTE" do
     before do
       stub_uploads_object_storage

spec/uploaders/personal_file_uploader_spec.rb

@@ -14,7 +14,6 @@ describe PersonalFileUploader do
                   upload_path: IDENTIFIER,
                   absolute_path: %r[#{CarrierWave.root}/uploads/-/system/personal_snippet/\d+/#{IDENTIFIER}]
 
-  # EE-specific
   context "object_store is REMOTE" do
     before do
       stub_uploads_object_storage