Claire ab59743c13 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.

2023-01-14 22:34:09 +01:00

..

activitypub

Refactor ActivityPub handling to prepare for non-Account actors (#19212)

2022-09-21 22:45:57 +02:00

admin

Fix crash when marking statuses as sensitive while some statuses are deleted (#22134)

2023-01-13 10:46:52 +01:00

api

Merge branch 'main' into glitch-soc/merge-upstream

2022-12-15 20:25:25 +01:00

auth

Revoke all authorized applications on password reset (#21325)

2022-12-15 15:47:06 +01: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

Validate nodeinfo response by schema (#21395)

2022-12-15 15:43:05 +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

…

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

…

media_proxy_controller_spec.rb

…

relationships_controller_spec.rb

…

shares_controller_spec.rb

…

statuses_cleanup_controller_spec.rb

…

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