luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-25 22:57:11 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers
History
Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
2021-11-26 22:53:55 +01:00
..
activitypub Fix followers synchronization mechanism not working when URI has empty path (#16744) 2021-09-15 18:51:16 +02:00
admin Fix admin statuses order(#16937) (#16969) 2021-11-26 22:12:27 +01:00
api Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
auth Fix webauthn secure key authentication (#16792) 2021-09-30 05:26:29 +02:00
concerns Fix cache_collection crashing when given an empty collection (#15921) 2021-03-18 00:41:32 +01:00
oauth
settings Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
well_known Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
about_controller_spec.rb
account_follow_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
account_unfollow_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
accounts_controller_spec.rb Prepare Mastodon for Rails 6 (#15911) 2021-03-17 10:09:55 +01:00
application_controller_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-03-24 10:53:50 +01:00
authorize_interactions_controller_spec.rb Change ResolveAccountService's handling of skip_webfinger (#15750) 2021-02-24 06:32:13 +01:00
emojis_controller_spec.rb
follower_accounts_controller_spec.rb Fix serialization of followers/following counts when user hides their network (#16418) 2021-06-21 20:14:47 +02:00
following_accounts_controller_spec.rb Fix serialization of followers/following counts when user hides their network (#16418) 2021-06-21 20:14:47 +02:00
health_controller_spec.rb Fix glitch-soc-specific health check spec 2021-04-05 15:21:38 +02:00
home_controller_spec.rb Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
intents_controller_spec.rb
invites_controller_spec.rb
manifests_controller_spec.rb
media_controller_spec.rb Fix error when rendering public pages with media attachments (#16763) 2021-10-13 15:27:19 +02:00
media_proxy_controller_spec.rb Fix media attachments enumeration (#14254) 2020-07-07 15:26:51 +02:00
relationships_controller_spec.rb Remove PubSubHubbub-related columns from accounts table (#16170) 2021-05-07 19:32:58 +02:00
remote_follow_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
remote_interaction_controller_spec.rb
shares_controller_spec.rb
statuses_cleanup_controller_spec.rb Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
statuses_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
tags_controller_spec.rb