mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 05:23:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/lib/activitypub
History
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
2023-02-25 14:00:40 +01:00
..
activity Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
parser Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
activity.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
adapter.rb Compact JSON-LD signed incoming activities (#17426) 2022-02-03 14:07:29 +01:00
case_transform.rb Enable Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
dereferencer.rb Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
forwarder.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
linked_data_signature.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
serializer.rb Fix ActivityPub context not being dynamically computed (#11746) 2019-09-03 22:52:32 +02:00
tag_manager.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00