Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.

2019-03-14 17:17:20 +01:00

..

accounts_cli.rb

Fix tootctl accounts delete not deleting user record as well (#9874)

2019-01-20 12:30:25 +01: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

Do not remove "dead" domains in tootctl accounts cull (#9108)

2018-10-27 22:56: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

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

Add tootctl statuses remove to sweep unreferenced statuses (#10063)

2019-03-11 13:45:17 +01:00

version.rb

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

2019-03-05 19:23:16 +01:00