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 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.		3 years ago
..
about	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
accounts	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
admin_mailer	Fixed not being able to display review pending hashtags in the admin UI. (#11875)	5 years ago
application	Fix lock icon not being shown when locking account in profile settings (#14190)	4 years ago
auth	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
authorize_interactions	Fix misleading error when attempting to re-send a pending follow request (#13133)	4 years ago
directories	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
errors	Add specific rate limits for posting and following (#13172)	4 years ago
filters	Fix not being able to change world filter expiration back to “Never” (#15858)	3 years ago
follower_accounts	Improve blocked view of profiles (#10491)	5 years ago
following_accounts	Improve blocked view of profiles (#10491)	5 years ago
home	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
invites	Remove invite comments from UI (#12068)	5 years ago
kaminari	…
layouts	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
media	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
notification_mailer	Stop setting a shortcode to newly-created media attachments (#16730)	3 years ago
oauth	Refactor settings controllers (#14767)	4 years ago
public_timelines	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
relationships	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
remote_follow	Admission-based registrations mode (#10250)	5 years ago
remote_interaction	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
settings	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
shared	Add honeypot fields and minimum fill-out time for sign-up form (#15276)	3 years ago
shares	Add subresource integrity for JS and CSS assets (#15096)	3 years ago
statuses	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
statuses_cleanup	Add feature to automatically delete old toots (#16529)	3 years ago
tags	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
user_mailer	Fix missing source strings and inconsistent lead text style in admin UI (#16052)	3 years ago
well_known/host_meta	Remove dependency on goldfinger gem (#14919)	4 years ago