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 6fdc4e8d47 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
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
connection_pool	Add request pool to improve delivery performance (#10353)	5 years ago
ostatus	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
proof_provider/keybase	Fix Keybase verification using wrong domain for remote accounts (#10547)	6 years ago
rss	Improve RSS entries for statuses (#13592)	5 years ago
settings	Add a test for Settings::Extend#settings (#5720)	7 years ago
delivery_failure_tracker_spec.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	5 years ago
extractor_spec.rb	Spec Extractor (#3540)	8 years ago
fast_ip_map_spec.rb	Add IP-based rules (#14963)	4 years ago
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
formatter_spec.rb	Fix crash when autolinking an invalid URI in Markdown	4 years ago
hash_object_spec.rb	Spec HashObject (#3544)	8 years ago
language_detector_spec.rb	Change language detection to include hashtags as words (#11341)	5 years ago
request_pool_spec.rb	Add request pool to improve delivery performance (#10353)	5 years ago
request_spec.rb	Fix connect timeout not being enforced (#9329)	6 years ago
sanitize_config_spec.rb	Add support for “start” and “reversed” attributes to ol element	4 years ago
spam_check_spec.rb	Fix various warnings in rspec (#14729)	4 years ago
status_filter_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago
status_finder_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
tag_manager_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
user_settings_decorator_spec.rb	Enable updating additional account information from user preferences via rest api (#6789)	7 years ago
webfinger_resource_spec.rb	Fix webfinger returning wrong status code on malformed or missing param (#13759)	5 years ago