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

Conflicts:
- `config/environments/production.rb`:
  Upstream changed headers, and we have different ones.
  Ported upstream's change.

2023-01-10 09:39:15 +01:00

..

activitypub

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

2022-10-02 18:46:22 +02:00

admin

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

2023-01-05 14:16:25 +01:00

api

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

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

auth

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

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

concerns

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

2023-01-10 09:39:15 +01:00

disputes

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

2022-03-02 18:02:48 +01:00

filters

Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)

2022-08-31 11:55:27 +02:00

oauth

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

2022-11-17 21:56:05 +01:00

settings

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

2022-11-16 08:30:00 +01:00

well_known

Remove Keybase integration (#17045)

2021-11-26 05:58:18 +01:00

about_controller.rb

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

accounts_controller.rb

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

2022-11-17 12:01:37 +01:00

application_controller.rb

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

2022-07-05 09:33:44 +02:00

authorize_interactions_controller.rb

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

2022-05-01 16:52:27 +02:00

custom_css_controller.rb

Add customizable user roles (#18641)

2022-07-05 02:41:40 +02:00

emojis_controller.rb

…

filters_controller.rb

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

2022-08-25 05:07:39 +02:00

follower_accounts_controller.rb

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

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

following_accounts_controller.rb

Fix single name variables on controller folder (#20092)

2022-12-15 17:11:58 +01:00

health_controller.rb

…

home_controller.rb

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

instance_actors_controller.rb

Fix instance actor not being dereferenceable (#17457)

2022-02-06 15:31:03 +01:00

intents_controller.rb

…

invites_controller.rb

…

manifests_controller.rb

…

media_controller.rb

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

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

media_proxy_controller.rb

Refactor how Redis locks are created (#18400)

2022-05-13 00:02:35 +02:00

privacy_controller.rb

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

relationships_controller.rb

…

shares_controller.rb

…

statuses_cleanup_controller.rb

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

2022-11-17 12:01:37 +01:00

statuses_controller.rb

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

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

tags_controller.rb

Fix single name variables on controller folder (#20092)

2022-12-15 17:11:58 +01:00