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 |
||
|---|---|---|
| .. | ||
| artifact_uploader_spec.rb | ||
| attachment_uploader_spec.rb | ||
| avatar_uploader_spec.rb | ||
| file_mover_spec.rb | ||
| file_uploader_spec.rb | ||
| gitlab_uploader_spec.rb | ||
| lfs_object_uploader_spec.rb | ||
| personal_file_uploader_spec.rb | ||
| records_uploads_spec.rb | ||
| uploader_helper_spec.rb | ||