Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +01:00

..

accounts_cli.rb

Remove unused option from tootctl accounts cull (#12074)

2019-10-06 04:30:07 +02:00

cache_cli.rb

Change tootctl to use inline parallelization instead of Sidekiq (#11776)

2019-09-10 13:48:48 +02:00

cli_helper.rb

Fix tootctl not allocating enough database connections for main thread (#12097)

2019-10-07 05:05:02 +02:00

domains_cli.rb

Change tootctl domains purge to accept multiple domains at once (#12046)

2019-10-02 04:49:53 +02:00

emoji_cli.rb

Add --remote-only option to emoji purge (#12810)

2020-01-10 00:10:17 +01:00

feeds_cli.rb

Fix tootctl not allocating enough database connections for main thread (#12097)

2019-10-07 05:05:02 +02:00

media_cli.rb

Fix error handling in tootctl media remove-orphans (#12571)

2019-12-09 04:26:00 +01:00

migration_helpers.rb

…

premailer_webpack_strategy.rb

…

preview_cards_cli.rb

Change tootctl to use inline parallelization instead of Sidekiq (#11776)

2019-09-10 13:48:48 +02:00

redis_config.rb

…

search_cli.rb

Add parallelization to tootctl search deploy (#12051)

2019-10-02 21:50:43 +02:00

settings_cli.rb

Admission-based registrations mode (#10250)

2019-03-14 05:28:30 +01:00

snowflake.rb

…

statuses_cli.rb

Keep statuses bookmarked by local users in tootctl statuses remove (#12818)

2020-01-11 06:41:37 +01:00

version.rb

Merge branch 'master' into glitch-soc/merge-upstream

2020-01-24 14:37:06 +01:00