catstodon/lib/mastodon
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
..
accounts_cli.rb Add tootctl accounts reset-relationships (#10483) 2019-04-08 07:46:55 +02:00
cli_helper.rb tootctl accounts [add|del|cull] (#8642) 2018-09-09 13:33:36 +02:00
domains_cli.rb Fix tootctl domains crawl with JSON format output crash (#9820) 2019-01-16 15:47:55 +01:00
emoji_cli.rb Add tootctl emoji purge (#10481) 2019-04-06 04:47:16 +02:00
feeds_cli.rb Do not remove "dead" domains in tootctl accounts cull (#9108) 2018-10-27 22:56:16 +02:00
media_cli.rb Fix "tootctl media remove" can't count the file size (#9288) 2018-11-16 09:47:40 +01:00
migration_helpers.rb Fix SUPERUSER postgres command (#9877) 2019-01-27 23:56:07 +01:00
premailer_webpack_strategy.rb ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372) 2018-01-29 01:06:39 +01:00
redis_config.rb Add support for separate Redis for cache (#7272) 2018-04-27 01:37:59 +02:00
search_cli.rb Add tootctl search deploy to avoid ugly rake task syntax (#10403) 2019-03-28 02:16:11 +01:00
settings_cli.rb Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
snowflake.rb Fixes/do not override timestamps (#7336) 2018-05-03 23:02:46 +02:00
statuses_cli.rb Fix missing long description on tootctl statuses remove (#10482) 2019-04-06 04:47:26 +02:00
version.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00