Claire a6147a831f Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/themes.rb` - `app/views/layouts/application.html.haml` - `app/views/layouts/embedded.html.haml` - `app/views/layouts/error.html.haml` - `config/settings.yml` All these conflicts are because glitch-soc and upstream have different theming systems and upstream changed a few things to have dynamic theme selection based on system settings. Conflicts were solved to take that into account, and `current_theme` has been changed in the process to return a tuple of `[flavour, skin]` to be used in the `theme_style_tags` helper.		2024-05-01 14:25:47 +02:00
..
activitypub	Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream	2024-03-15 12:20:32 +01:00
admin	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
api	Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream	2024-04-06 20:34:07 +02:00
auth	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
concerns	Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream	2024-05-01 14:25:47 +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	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
redirect	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
settings	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
well_known	Add fallback redirection when getting a webfinger query `WEB_DOMAIN@WEB_DOMAIN` (#28592)	2024-01-04 14:14:46 +00:00
about_controller.rb	…
accounts_controller.rb	Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream	2023-12-20 20:10:45 +01:00
application_controller.rb	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
authorize_interactions_controller.rb	…
backups_controller.rb	…
custom_css_controller.rb	Add scope `providing_styles` to `UserRole` (#29286)	2024-02-20 09:18:05 +00:00
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	Disable `Rails/ApplicationController` for `HealthController` (#28705)	2024-01-12 09:08:17 +00:00
home_controller.rb	…
instance_actors_controller.rb	Move common module inclusion in sub classes to `ActivityPub::BaseController` (#29560)	2024-03-15 10:40:21 +00:00
intents_controller.rb	Remove redundant `return` in `IntentsController` (#29099)	2024-02-06 12:56:22 +00:00
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	…
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	Use existing `SeveredRelationship.about_local_account` scope in more places (#29673)	2024-03-21 08:36:49 +00:00
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	…