luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-04 12:34:32 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Claire b2915613fb Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Upstream-updated lib textually too close to glitch-soc-only dep.
  Updated like upstream.
2022-01-28 08:58:32 +01:00
..
chewy Add trending links (#16917) 2021-11-25 13:07:38 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-01-26 22:32:21 +01:00
javascript Add optional hCaptcha support 2022-01-24 21:22:13 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
mailers Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-12-18 11:44:54 +01:00
presenters
serializers Change CAPTCHA handling to be only on email verification 2022-01-25 23:56:57 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01:00
views Add some explanation text on the CAPTCHA confirmation page 2022-01-26 13:24:51 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00