mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/lib/mastodon
History
Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream updated `docker/build-push-action`, and we a different config
  for `docker/metadata-action` so the lines directly above were different,
  but it's not a real conflict.
  Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Upstream changed the codestyle near a line we had modified to accommodate
  configurable character count.
  Kept our change.
 		2023-02-03 19:23:27 +01:00
..
accounts_cli.rb Implement tootctl accounts prune (#18397) 2023-01-13 22:34:16 +01:00
cache_cli.rb
…
canonical_email_blocks_cli.rb Add admin API for managing canonical e-mail blocks (#19067) 2022-08-28 03:31:54 +02:00
cli_helper.rb Fix opening and closing Redis connections instead of using a pool (#18171) 2022-04-29 22:43:07 +02:00
domains_cli.rb Add `tootctl domains purge` options to select subdomains and keep domain blocks (#22063) 2023-01-18 16:50:50 +01:00
email_domain_blocks_cli.rb Fix tootctl email_domain_blocks add (#17842) 2022-03-21 19:10:09 +01:00
emoji_cli.rb Enable importing GIF emojis in CLI (#17706) 2022-03-06 23:41:44 +01:00
feeds_cli.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
ip_blocks_cli.rb Fix tootctl ip_blocks add failing if not given a comment (#15263) 2020-12-02 21:19:41 +01:00
maintenance_cli.rb Fix index name in fix-duplicates task (#20632) 2022-11-14 08:33:48 +01:00
media_cli.rb Add command to remove avatar and header images of inactive remote accounts from the local database (#22149) 2022-12-14 19:50:07 +01:00
migration_helpers.rb Fix migration error handling (#17991) 2022-04-07 20:46:30 +02:00
premailer_webpack_strategy.rb
…
preview_cards_cli.rb
…
rack_middleware.rb Fix opening and closing Redis connections instead of using a pool (#18171) 2022-04-29 22:43:07 +02:00
redis_config.rb Add logging for Rails cache timeouts (#21667) 2022-11-27 20:37:37 +01:00
search_cli.rb Fix typos (#18604) 2022-08-28 17:44:34 +02:00
settings_cli.rb Add ability to set approval-based registration through tootctl (#18248) 2022-05-02 17:41:34 +02:00
sidekiq_middleware.rb Fix opening and closing Redis connections instead of using a pool (#18171) 2022-04-29 22:43:07 +02:00
snowflake.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
statuses_cli.rb Spelling (#17705) 2022-03-06 22:51:40 +01:00
upgrade_cli.rb Fix `tootctl upgrade storage-schema` S3 ACL (#13768) 2020-05-17 17:27:36 +02:00
version.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-03 19:23:27 +01:00