Claire afd71867ba Revert "Fix trends admin page crashing" ...

This reverts commit 5f10e64330.

2021-11-26 01:15:29 +01:00

..

controllers

Merge branch 'main' into glitch-soc/merge-upstream

2021-11-25 23:50:35 +01:00

fabricators

Add feature to automatically delete old toots (#16529)

2021-08-09 23:11:50 +02:00

features

Add submit button to the top of preferences pages (#13068)

2020-03-08 16:04:03 +01:00

fixtures

Fix some link previews being incorrectly generated from other prior links (#16885)

2021-10-21 20:39:35 +02:00

helpers

Merge branch 'main' into glitch-soc/merge-upstream

2021-11-25 23:50:35 +01:00

lib

Merge branch 'main' into glitch-soc/merge-upstream

2021-11-06 00:15:38 +01:00

mailers

Add trending links (#16917)

2021-11-25 13:07:38 +01:00

models

Revert "Fix trends admin page crashing"

2021-11-26 01:15:29 +01:00

policies

Merge branch 'master' into glitch-soc/merge-upstream

2020-11-08 14:20:35 +01:00

presenters

Change references to tootsuite/mastodon to mastodon/mastodon (#16491)

2021-07-13 15:46:20 +02:00

requests

Further preparation for Rails 6 (#15916)

2021-03-19 02:45:34 +01:00

routing

…

serializers/activitypub

…

services

Merge branch 'main' into glitch-soc/merge-upstream

2021-11-25 23:50:35 +01:00

support

Fix base64-encoded file uploads not being possible (#12748)

2020-01-04 01:54:07 +01:00

validators

Merge branch 'main' into glitch-soc/merge-upstream

2021-04-20 12:17:14 +02:00

views

Merge branch 'main' into glitch-soc/merge-upstream

2021-10-13 15:50:24 +02:00

workers

Fix AccountNote not having a maximum length (#16942)

2021-11-06 00:12:25 +01:00

rails_helper.rb

Add WebAuthn as an alternative 2FA method (#14466)

2020-08-24 16:46:27 +02:00

spec_helper.rb

Move rspec examples to tmp dir (#12539)

2019-12-02 19:55:08 +01:00