mastodon

History

Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.	2020-03-22 16:10:44 +01:00
..
media_controller.rb	Change local media attachments to perform heavy processing asynchronously (#13210 )	2020-03-08 23:56:18 +01:00
search_controller.rb	…

Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.

2020-03-22 16:10:44 +01:00

media_controller.rb

Change local media attachments to perform heavy processing asynchronously (#13210 )

2020-03-08 23:56:18 +01:00

search_controller.rb

…