diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-12 10:15:46 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-12 10:15:46 +0100 |
| commit | 3e63fcd4f07b13ba647dfa8a3bac6b1ebbd76614 (patch) | |
| tree | 756a29c017aa843ddb0773627dabb27b08e45960 /lib/paperclip/gif_transcoder.rb | |
| parent | 932a22219ae99a285bdd0b69f02627f029327db3 (diff) | |
| parent | 15b88a83ab7dbe022e33552f45f300fc69a934d0 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.
Diffstat (limited to 'lib/paperclip/gif_transcoder.rb')
0 files changed, 0 insertions, 0 deletions