You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 7066e3d5ce Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.		1 year ago
..
exports	Add import/export feature for bookmarks (#14956)	4 years ago
migration	Refactor settings controllers (#14767)	4 years ago
preferences	Add time zone preference (#25342)	1 year ago
two_factor_authentication	Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream	1 year ago
aliases_controller.rb	Refactor settings controllers (#14767)	4 years ago
applications_controller.rb	Fix Rails/ActionOrder cop (#24692)	1 year ago
base_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
deletes_controller.rb	Remove setting that disables account deletes (#17683)	2 years ago
exports_controller.rb	Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741)	1 year ago
featured_tags_controller.rb	Change featured hashtag deletion to be done synchronously (#19590)	2 years ago
flavours_controller.rb	Fix most rubocop issues (#2165)	1 year ago
imports_controller.rb	Add support for importing lists (#25203)	1 year ago
login_activities_controller.rb	Fix login date not showing up in login history by using “public” pack	3 years ago
migrations_controller.rb	Refactor settings controllers (#14767)	4 years ago
pictures_controller.rb	Fix profile update not being sent on profile/header picture deletion (#15461)	4 years ago
profiles_controller.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	3 years ago
sessions_controller.rb	Refactor settings controllers (#14767)	4 years ago
two_factor_authentication_methods_controller.rb	Refactor settings controllers (#14767)	4 years ago
verifications_controller.rb	Change edit profile page (#25413)	1 year ago