Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
about	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
admin_mailer	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
application	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-23 10:46:24 +02:00
authorize_interactions	Fix misleading error when attempting to re-send a pending follow request (#13133)	2020-02-24 21:19:19 +01:00
directories	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
errors	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
filters	Fix not being able to change world filter expiration back to “Never” (#15858)	2021-03-12 05:25:50 +01:00
follower_accounts
following_accounts
home	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
invites
kaminari
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-30 00:42:52 +02:00
media	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
notification_mailer	Stop setting a shortcode to newly-created media attachments (#16730)	2021-09-13 18:59:37 +02:00
oauth	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
public_timelines	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
relationships	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
remote_follow
remote_interaction
settings	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-20 16:14:45 +02:00
shared	Add honeypot fields and minimum fill-out time for sign-up form (#15276)	2020-12-10 06:27:26 +01:00
shares	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
statuses_cleanup	Add feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
tags	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
user_mailer	Fix missing source strings and inconsistent lead text style in admin UI (#16052)	2021-04-17 11:12:49 +02:00
well_known/host_meta	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00