djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-24 00:54:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
93912f0498
tootlab-mastodon/spec
History
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2022-11-12 13:28:03 +01:00
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
fabricators png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
features Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
fixtures Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
helpers Test the native_locale_name of a non-standard locale (#20284) 2022-11-11 00:06:18 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
mailers Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
requests Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
routing Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
serializers/activitypub Fix account URI in UpdatePollSerializer (#11194) 2019-06-27 19:41:55 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-11-08 15:44:57 +01:00
support Spelling (#17705) 2022-03-06 22:51:40 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +02:00
views/statuses Redirect non-logged-in user to owner statuses on single user mode (#19333) 2022-10-12 21:07:30 +02:00
workers Fix followers count not being updated when migrating follows (#19998) 2022-11-07 15:38:55 +01:00
rails_helper.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
spec_helper.rb Improve tests involving push_bulk (#17508) 2022-02-10 19:42:45 +01:00