alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/workers/scheduler
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
..
backup_cleanup_scheduler.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
doorkeeper_cleanup_scheduler.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
email_scheduler.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
feed_cleanup_scheduler.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
ip_cleanup_scheduler.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
media_cleanup_scheduler.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
pghero_scheduler.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
scheduled_statuses_scheduler.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
trending_tags_scheduler.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
user_cleanup_scheduler.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00