Claire fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v1/timelines/tag_spec.rb`: Upstream refactored this file, while we had a change to switch a default setting. Updated as upstream did. - `spec/views/statuses/show.html.haml_spec.rb`: Upstream refactored this file, while we stubbed different methods. Updated as upstream did, and updated the stubs accordingly.		2024-09-03 21:51:53 +02:00
..
activitypub	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
admin	Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream	2024-07-29 19:16:58 +02:00
api	Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream	2024-09-03 21:51:53 +02:00
auth	Fix log out from user menu not working on Safari (#31402)	2024-08-13 17:49:23 +00:00
concerns	Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream	2024-08-02 18:09:48 +02:00
disputes	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
filters	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
oauth	Merge pull request from GHSA-vp5r-5pgw-jwqx	2024-07-04 16:11:28 +02:00
redirect	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
settings	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
well_known	Implement RFC 8414 for OAuth 2.0 server metadata (#29191)	2024-05-06 13:17:56 +00:00
about_controller.rb	…
accounts_controller.rb	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
application_controller.rb	Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream	2024-07-25 17:47:02 +02:00
authorize_interactions_controller.rb	…
backups_controller.rb	…
custom_css_controller.rb	…
emojis_controller.rb	…
filters_controller.rb	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
follower_accounts_controller.rb	…
following_accounts_controller.rb	…
health_controller.rb	…
home_controller.rb	…
instance_actors_controller.rb	…
intents_controller.rb	…
invites_controller.rb	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
mail_subscriptions_controller.rb	Fix contrast between background and form elements on some pages (#31266)	2024-08-02 13:55:31 +00:00
manifests_controller.rb	…
media_controller.rb	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
media_proxy_controller.rb	…
privacy_controller.rb	…
relationships_controller.rb	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
remote_interaction_helper_controller.rb	…
severed_relationships_controller.rb	…
shares_controller.rb	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
statuses_cleanup_controller.rb	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
statuses_controller.rb	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
tags_controller.rb	Rename `cache_*` methods to `preload_*` in controller concern (#30209)	2024-05-16 08:03:46 +00:00