luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 11:53:13 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers
History
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
activitypub Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
api Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
auth Fix suspicious sign-in mails never being sent (#18599) 2022-06-21 15:16:22 +02:00
concerns Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
disputes Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
oauth
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
well_known Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
about_controller_spec.rb Change about page to be mounted in the web UI (#19345) 2022-10-13 14:42:37 +02:00
accounts_controller_spec.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
application_controller_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
authorize_interactions_controller_spec.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
emojis_controller_spec.rb
follower_accounts_controller_spec.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
following_accounts_controller_spec.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +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 Revert Home controller test to upstream 2022-10-28 20:12:04 +02:00
instance_actors_controller_spec.rb Fix instance actor not being dereferenceable (#17457) 2022-02-06 15:31:03 +01:00
intents_controller_spec.rb
invites_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
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
relationships_controller_spec.rb Remove PubSubHubbub-related columns from accounts table (#16170) 2021-05-07 19:32:58 +02:00
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 Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
tags_controller_spec.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00