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 ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		4 years ago
..
accounts_cli.rb	Change account suspensions to be reversible by default (#14726)	4 years ago
cache_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
cli_helper.rb	Change `tootctl search deploy` algorithm (#14300)	5 years ago
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	Add `tootctl emoji export` (#13534)	5 years ago
feeds_cli.rb	Fix tootctl not allocating enough database connections for main thread (#12097)	5 years ago
ip_blocks_cli.rb	Add IP-based rules (#14963)	4 years ago
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	Do not suggest to login into the GitLab database (#13084)	5 years ago
premailer_webpack_strategy.rb	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	7 years ago
preview_cards_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
redis_config.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	4 years ago
search_cli.rb	Change `tootctl search deploy` algorithm (#14300)	5 years ago
settings_cli.rb	Admission-based registrations mode (#10250)	6 years ago
snowflake.rb	Fixes/do not override timestamps (#7336)	7 years ago
statuses_cli.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
upgrade_cli.rb	Fix `tootctl upgrade storage-schema` S3 ACL (#13768)	5 years ago
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago