mastodon/app/lib
Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes.
2020-08-30 16:13:08 +02:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
connection_pool Add request pool to improve delivery performance (#10353) 2019-07-02 00:34:38 +02:00
nodeinfo Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +02:00
ostatus Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
proof_provider Fix rubocop warning (#14288) 2020-07-14 19:05:07 +02:00
rss Improve RSS entries for statuses (#13592) 2020-05-10 09:50:54 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-07-15 15:32:40 +02:00
activity_tracker.rb Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +02:00
application_extension.rb
delivery_failure_tracker.rb Change delivery failure tracking to work with hostnames instead of URLs (#13437) 2020-04-15 20:33:24 +02:00
entity_cache.rb Fix PostgreSQL load when linking in announcements (#13250) 2020-04-05 12:51:22 +02:00
exceptions.rb Fix movie width and frame_rate returning nil (#14357) 2020-07-19 22:28:27 +02:00
extractor.rb
fast_geometry_parser.rb
feed_manager.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
formatter.rb Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe” 2020-03-24 12:07:47 +01:00
hash_object.rb
inline_renderer.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
language_detector.rb Fix Thai being skipped from language detection (#13989) 2020-06-25 22:45:01 +02:00
potential_friendship_tracker.rb Create Redisable#redis (#9633) 2019-02-02 19:11:38 +01:00
proof_provider.rb Add Keybase integration (#10297) 2019-03-18 21:00:55 +01:00
rate_limiter.rb Add rate limit for reporting (#13390) 2020-04-05 14:40:08 +02:00
request.rb Fix rubocop warning (#14288) 2020-07-14 19:05:07 +02:00
request_pool.rb Add request pool to improve delivery performance (#10353) 2019-07-02 00:34:38 +02:00
response_with_limit.rb Fix remote files not using Content-Type header, streaming (#14184) 2020-06-30 23:58:02 +02:00
rss_builder.rb
sanitize_config.rb Add support for li attribute to li element 2020-07-01 01:02:27 +02:00
search_query_parser.rb Fix accounts search by full/partial display name and others (#11580) 2019-08-16 13:00:30 +02:00
search_query_transformer.rb Fix error when searching for empty phrase (#12711) 2019-12-30 18:30:24 +01:00
sidekiq_error_handler.rb Fix error within error when limiting backtrace to 3 lines (#13120) 2020-05-10 10:30:27 +02:00
spam_check.rb Exempt staff members from spam check (#12874) 2020-01-17 07:50:30 +01:00
status_filter.rb
status_finder.rb Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
tag_manager.rb Fix exception when trying to serialize posts with <a> tags in them without hrefs (#1334) 2020-05-28 12:47:40 +02:00
themes.rb Allow selecting both default flavour and theme 2018-10-12 19:06:35 +02:00
toc_generator.rb Add fallback section ID with ToC (#11941) 2019-09-23 17:25:10 +02:00
user_settings_decorator.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
webfinger_resource.rb Fix webfinger returning wrong status code on malformed or missing param (#13759) 2020-05-14 23:28:06 +02:00