queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/lib
History
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
..
activitypub Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
connection_pool Add request pool to improve delivery performance (#10353) 2019-07-02 00:34:38 +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 Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565) 2019-04-21 04:53:24 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
activity_tracker.rb
application_extension.rb
delivery_failure_tracker.rb
entity_cache.rb
exceptions.rb
extractor.rb
fast_geometry_parser.rb
feed_manager.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
formatter.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
hash_object.rb
inline_renderer.rb
language_detector.rb Change language detection to include hashtags as words (#11341) 2019-07-18 03:02:15 +02:00
potential_friendship_tracker.rb
proof_provider.rb Add Keybase integration (#10297) 2019-03-18 21:00:55 +01:00
request.rb Attempt to concurrently connect to remote IP addresses (#11757) 2019-09-05 05:32:53 +02:00
request_pool.rb Add request pool to improve delivery performance (#10353) 2019-07-02 00:34:38 +02:00
rss_builder.rb
sanitize_config.rb Add support for <sup> formatting element 2019-08-20 21:44:09 +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 accounts search by full/partial display name and others (#11580) 2019-08-16 13:00:30 +02:00
sidekiq_error_handler.rb Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230) 2019-07-02 01:01:17 +02:00
spam_check.rb Add setting to disable the anti-spam (#11296) 2019-07-17 21:09:15 +02: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 Refactor domain block checks (#11268) 2019-07-09 03:27:35 +02:00
themes.rb
user_settings_decorator.rb Add option to disable emoji replacements 2019-08-12 23:01:37 +02:00
webfinger_resource.rb Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00