mastodon/app/views
Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests.
2022-01-23 18:24:01 +01:00
..
about Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
admin_mailer Remove IP tracking columns from users table (#16409) 2022-01-16 13:23:50 +01:00
application Add trending links (#16917) 2021-11-25 13:07:38 +01:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +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 '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 2022-01-23 18:24:01 +01:00
media Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
notification_mailer Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01: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-11-26 22:53:55 +01: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 2022-01-23 18:24:01 +01: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 Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
well_known/host_meta Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00