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 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.		5 years ago
..
activitypub	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	5 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	…
delivery_failure_tracker_spec.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	5 years ago
extractor_spec.rb	…
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
formatter_spec.rb	Add support for magnet: URIs (#12905)	5 years ago
hash_object_spec.rb	…
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	…
sanitize_config_spec.rb	Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe”	5 years ago
spam_check_spec.rb	Remove auto-silence behaviour from spam check (#12117)	5 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	…
webfinger_resource_spec.rb	…