6 commits

Author	SHA1	Message	Date
Claire	4bea9a0a66	Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream	2025-03-07 18:34:27 +01:00
Matt Jankowski	551339401d	Use methods from SystemHelpers more consistently (#33973)	2025-03-07 08:02:55 +00:00
Claire	fcc5262f60	Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream ... Conflicts: - `spec/system/settings/preferences/appearance_spec.rb`: Upstream tests for changing themes in there, but glitch-soc has its own place for that. Updated upstream's change while skipping the theme test.	2025-01-27 18:19:09 +01:00
Matt Jankowski	93f3c724ae	Use expect in remaining controller locations (#33748)	2025-01-27 16:32:06 +00:00
Claire	0aa69487a2	Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/user/has_settings.rb`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `app/views/settings/preferences/appearance/show.html.haml`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `config/routes.rb`: Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had an extra route. Moved the extra route to `config/routes/web_app.rb`. - `spec/controllers/settings/preferences/appearance_controller_spec.rb`: This spec got converted to a system spec upstream. However, the theme setting works differently in glitch-soc, so the spec had been changed. Changed the corresponding system spec as well.	2024-12-25 18:01:37 +01:00
Matt Jankowski	efe4e72f93	Convert settings/preferences/appearance controller spec to system (#33323)	2024-12-16 17:08:19 +00:00