This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire 42a0898f16 Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here.		2023-06-10 18:42:29 +02:00
..
exports	Add import/export feature for bookmarks (#14956)	2020-11-19 17:48:13 +01:00
migration	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
preferences	Add time zone preference (#25342)	2023-06-10 03:29:37 +02:00
two_factor_authentication	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream	2023-05-08 15:28:36 +02:00
aliases_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
applications_controller.rb	Fix Rails/ActionOrder cop (#24692)	2023-04-30 06:46:39 +02:00
base_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
deletes_controller.rb	Remove setting that disables account deletes (#17683)	2022-10-06 10:16:47 +02:00
exports_controller.rb	Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741)	2023-05-02 18:16:07 +02:00
featured_tags_controller.rb	Change featured hashtag deletion to be done synchronously (#19590)	2022-10-31 16:31:44 +01:00
flavours_controller.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
imports_controller.rb	Add support for importing lists (#25203)	2023-06-01 14:47:31 +02:00
login_activities_controller.rb	Fix login date not showing up in login history by using “public” pack	2021-06-23 12:21:40 +02:00
migrations_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
pictures_controller.rb	Fix profile update not being sent on profile/header picture deletion (#15461)	2020-12-30 23:19:18 +01:00
profiles_controller.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	2022-03-07 09:36:47 +01:00
sessions_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
two_factor_authentication_methods_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00