monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/lib/mastodon
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
..
accounts_cli.rb Add `--remove-role` option to `tootctl accounts modify` (#19477) 2022-10-27 14:31:10 +02:00
cache_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
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 --by-uri option to `tootctl domains purge` (#16434) 2021-07-07 21:17:00 +02: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 wrong language code for Kurdish languages (#17812) 2022-03-17 01:37:03 +01:00
media_cli.rb Fix Ambiguous SQL error on tootctl media refresh (#19206) 2022-09-20 23:50:19 +02:00
migration_helpers.rb Fix migration error handling (#17991) 2022-04-07 20:46:30 +02:00
premailer_webpack_strategy.rb ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372) 2018-01-29 01:06:39 +01:00
preview_cards_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
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 Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02: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 2022-11-06 09:50:41 +01:00