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.

Thibaut Girka c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.		2020-11-12 22:13:57 +01:00
..
about	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
admin_mailer	Fixed not being able to display review pending hashtags in the admin UI. (#11875)	2019-09-17 16:59:16 +02:00
application	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +02:00
auth	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01: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 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
errors	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
filters	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
follower_accounts	…
following_accounts	…
home	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
invites	Remove invite comments from UI (#12068)	2019-10-03 22:37:13 +02:00
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
media	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
notification_mailer	Fix NotificationMailer failing when receiving mention with media from remote instance (#11765)	2019-09-05 06:14:30 +02:00
oauth	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
public_timelines	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
relationships	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-12 22:13:57 +01:00
remote_follow	…
remote_interaction	…
settings	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
shared	Remove fallback to long description on sidebar and meta description (#12119)	2019-10-08 22:08:55 +02:00
shares	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
tags	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
user_mailer	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
well_known/host_meta	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00