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
..
about	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
accounts	Avoid unnecessary i-var for account rss page url generation (#28092)	2023-11-28 08:19:08 +00:00
admin	Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream	2024-03-20 18:31:09 +01:00
admin_mailer	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01:00
application	Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream	2024-03-19 19:21:12 +01:00
auth	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
custom_css	Spec coverage for custom css endpoint (#28706)	2024-01-12 09:19:25 +00:00
disputes/strikes	Add coverage/bugfix for invalid appeal submission (#28703)	2024-01-12 09:21:00 +00:00
errors	Use ENV.fetch in views, fixes rubocop haml-lint issue (#27527)	2023-10-24 09:30:14 +00:00
filters	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
follower_accounts	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
following_accounts	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
home	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
invites	Fix haml-lint InstanceVariables rule for invites/_form (#26064)	2023-09-28 15:40:28 +02:00
kaminari	Fix missing translation in pagination gap tags (#24262)	2023-03-29 13:54:33 +02:00
layouts	Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream	2024-05-01 14:25:47 +02:00
mail_subscriptions	Fix LineLength haml-lint in t usage (#28686)	2024-01-11 09:32:32 +00:00
media	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
notification_mailer	Update follow and follow_request emails (#28755)	2024-01-17 14:37:04 +00:00
oauth	Add Account#unavailable? and Account#permanently_unavailable? aliases (#28053)	2023-11-30 15:43:26 +00:00
privacy	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
redirects	Add confirmation when redirecting logged-out requests to permalink (#27792)	2024-01-24 10:49:19 +00:00
relationships	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
remote_interaction_helper	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
severed_relationships	Change AccountRelationshipSeveranceEvent model to store lost followers and following counts separately (#29714)	2024-03-22 15:44:31 +00:00
shared	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
shares	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
statuses	Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream	2023-10-25 19:59:17 +02:00
statuses_cleanup	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
tags	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
user_mailer	Fix user_mailer.welcome.hashtags_recent_count not having plural form (#29607)	2024-03-16 16:38:20 +00:00
well_known/host_meta	Rubocop fix: Perfomance/UnfreezeString (#26217)	2023-07-28 23:11:05 +02:00
.rubocop.yml	Solve simplest haml-lint Rubocop lints (#27529)	2023-10-25 12:38:01 +00:00