![]() 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 |
||
---|---|---|
.. | ||
user_uploads_avatar_to_group_spec.rb | ||
user_uploads_avatar_to_profile_spec.rb | ||
user_uploads_file_to_note_spec.rb |