luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-01 02:53:47 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/lib/activitypub/activity
History
Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
  Upstream changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/models/user.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc not preventing moved accounts from logging
  in.
  Ported upstream changes while keeping the ability for moved accounts to log
  in.
- `app/policies/status_policy.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's ability  to hide followers count.
  Ported upstream changes.
- `app/services/process_mentions_service.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `package.json`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
2020-09-28 14:13:30 +02:00
..
accept.rb Allow Accept/Reject with a non-embedded object (#12199) 2019-10-24 22:45:43 +02:00
add.rb Resolve unknown status from Add activity, skip Remove if unknown (#7526) 2018-05-18 11:33:56 +02:00
announce.rb Add support for inlined objects in activity audience (#14514) 2020-08-24 14:11:47 +02:00
block.rb Fix not handling Undo on some activity types when they aren't inlined (#14346) 2020-07-22 11:45:35 +02:00
create.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
delete.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
flag.rb Change domain blocks to automatically support subdomains (#11138) 2019-06-22 00:13:10 +02:00
follow.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
like.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
move.rb Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
reject.rb Fix handling of Reject Follow when a matching follow relationship exists (#14479) 2020-08-01 18:20:37 +02:00
remove.rb Resolve unknown status from Add activity, skip Remove if unknown (#7526) 2018-05-18 11:33:56 +02:00
undo.rb Fix not handling Undo on some activity types when they aren't inlined (#14346) 2020-07-22 11:45:35 +02:00
update.rb Dereference object URIs in Create and Update messages (#14359) 2020-07-22 11:43:17 +02:00