mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-03 18:39:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/lib/mastodon
History
Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
2023-03-05 20:46:56 +01:00
..
accounts_cli.rb Fix tootctl accounts migrate error due to typo (#23567) 2023-03-03 20:45:12 +01: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 Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
domains_cli.rb Autofix Rubocop Style/RescueStandardError (#23745) 2023-02-20 11:01:20 +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 Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
feeds_cli.rb Upgrade to latest redis-rb 4.x and fix deprecations (#23616) 2023-03-04 16:38:28 +01:00
ip_blocks_cli.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
maintenance_cli.rb Autofix Rubocop Style/FormatString (#23743) 2023-02-20 07:58:33 +01:00
media_cli.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
migration_helpers.rb Enable Lint/RedundantCopDisableDirective (#23687) 2023-02-18 04:30:14 +01:00
premailer_webpack_strategy.rb Autofix Rubocop Rails/RootPathnameMethods (#23760) 2023-02-22 09:57:15 +09: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 Enable Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
search_cli.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09: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 Enable Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
statuses_cli.rb Apply Rubocop Performance/StringIdentifierArgument (#23444) 2023-02-08 02:36:20 +01:00
upgrade_cli.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
version.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 22:49:59 +01:00