Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
53dc5264
Commit
53dc5264
authored
Mar 27, 2018
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '40781-os-to-ce-ee' into 'master'
40781 Port to EE See merge request gitlab-org/gitlab-ee!5128
parents
1be33b34
e789d013
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
4 deletions
+0
-4
spec/uploaders/attachment_uploader_spec.rb
spec/uploaders/attachment_uploader_spec.rb
+0
-1
spec/uploaders/avatar_uploader_spec.rb
spec/uploaders/avatar_uploader_spec.rb
+0
-1
spec/uploaders/namespace_file_uploader_spec.rb
spec/uploaders/namespace_file_uploader_spec.rb
+0
-1
spec/uploaders/personal_file_uploader_spec.rb
spec/uploaders/personal_file_uploader_spec.rb
+0
-1
No files found.
spec/uploaders/attachment_uploader_spec.rb
View file @
53dc5264
...
...
@@ -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
View file @
53dc5264
...
...
@@ -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
View file @
53dc5264
...
...
@@ -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
View file @
53dc5264
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment