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
7e2856fa
Commit
7e2856fa
authored
Feb 06, 2018
by
Micaël Bergeron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ce-to-ee `spec/factories/uploads.rb`
parent
56123f9e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
17 deletions
+2
-17
spec/factories/uploads.rb
spec/factories/uploads.rb
+2
-17
No files found.
spec/factories/uploads.rb
View file @
7e2856fa
...
...
@@ -5,10 +5,7 @@ FactoryBot.define do
uploader
"AvatarUploader"
mount_point
:avatar
secret
nil
<<<<<<<
HEAD
store
ObjectStorage
::
Store
::
LOCAL
=======
>>>>>>>
upstream
/
master
# we should build a mount agnostic upload by default
transient
do
...
...
@@ -19,32 +16,20 @@ FactoryBot.define do
path
{
File
.
join
(
"uploads/-/system"
,
model
.
class
.
to_s
.
underscore
,
mount_point
.
to_s
,
'avatar.jpg'
)
}
trait
:personal_snippet_upload
do
<<<<<<<
HEAD
model
{
build
(
:personal_snippet
)
}
path
{
File
.
join
(
secret
,
filename
)
}
uploader
"PersonalFileUploader"
=======
uploader
"PersonalFileUploader"
path
{
File
.
join
(
secret
,
filename
)
}
model
{
build
(
:personal_snippet
)
}
>>>>>>>
upstream
/
master
secret
SecureRandom
.
hex
end
trait
:issuable_upload
do
<<<<<<<
HEAD
path
{
File
.
join
(
secret
,
filename
)
}
uploader
"FileUploader"
path
{
File
.
join
(
secret
,
filename
)
}
secret
SecureRandom
.
hex
end
trait
:object_storage
do
store
ObjectStorage
::
Store
::
REMOTE
=======
uploader
"FileUploader"
path
{
File
.
join
(
secret
,
filename
)
}
secret
SecureRandom
.
hex
>>>>>>>
upstream
/
master
end
trait
:namespace_upload
do
...
...
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