Commit 53dc5264 authored by Sean McGivern's avatar Sean McGivern

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

40781 Port to EE

See merge request gitlab-org/gitlab-ee!5128
parents 1be33b34 e789d013
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment