me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/spec
History
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
fabricators png optimization(loss less) () 2022-11-01 15:06:52 +01:00
features Change public accounts pages to mount the web UI () 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 Add audit log entries for user roles () 2022-08-25 20:39:40 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
mailers Add support for language preferences for trending statuses and links () 2022-10-08 16:45:40 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +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 () 2022-10-20 14:35:29 +02:00
routing Change public accounts pages to mount the web UI () 2022-10-20 14:35:29 +02:00
serializers/activitypub Fix account URI in UpdatePollSerializer () 2019-06-27 19:41:55 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
support Spelling () 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 () 2022-10-12 21:07:30 +02:00
workers Add retention policy for cached content and media () 2022-09-27 03:08:19 +02:00
rails_helper.rb Fix single Redis connection being used across all threads () 2022-04-28 17:47:34 +02:00
spec_helper.rb Improve tests involving push_bulk () 2022-02-10 19:42:45 +01:00