1d1363e2bb
Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
8 lines
192 B
Ruby
8 lines
192 B
Ruby
FactoryGirl.define do
|
|
factory :upload do
|
|
model { build(:project) }
|
|
path { "uploads/system/project/avatar/avatar.jpg" }
|
|
size 100.kilobytes
|
|
uploader "AvatarUploader"
|
|
end
|
|
end
|