You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.		4 years ago
..
accounts_cli.rb	Change account suspensions to be reversible by default (#14726)	4 years ago
cache_cli.rb	…
cli_helper.rb	…
domains_cli.rb	Change account suspensions to be reversible by default (#14726)	4 years ago
email_domain_blocks_cli.rb	Improve email address validation (#14565)	4 years ago
emoji_cli.rb	…
feeds_cli.rb	…
media_cli.rb	Change S3 ACL in "tootctl media remove-orphans --fix-permissions" from fixed value to environment file's value. (#14715)	4 years ago
migration_helpers.rb	…
premailer_webpack_strategy.rb	…
preview_cards_cli.rb	…
redis_config.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	4 years ago
search_cli.rb	…
settings_cli.rb	…
snowflake.rb	…
statuses_cli.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
upgrade_cli.rb	…
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago