mastodon/spec/lib
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.
2019-01-10 21:00:30 +01:00
..
activitypub Revert "Revert "Add handler for Move activity (#9629)"" 2019-01-10 18:46:17 +01:00
ostatus rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
formatter_spec.rb Bump sanitize from 4.6.6 to 5.0.0 (#9140) 2018-10-29 14:05:25 +01:00
hash_object_spec.rb
language_detector_spec.rb Leave unknown language as nil if account is remote (#8861) 2018-10-05 19:17:46 +02:00
request_spec.rb Fix connect timeout not being enforced (#9329) 2018-11-22 20:12:04 +01:00
status_filter_spec.rb
status_finder_spec.rb Add tests for embeds controller (#7719) 2018-06-04 10:35:56 +09:00
tag_manager_spec.rb
user_settings_decorator_spec.rb
webfinger_resource_spec.rb