1
0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
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 ()"" 2019-01-10 18:46:17 +01:00
ostatus rubocop issues - Cleaning up () 2018-10-08 04:50:11 +02:00
settings Add a test for Settings::Extend#settings () 2017-11-19 04:15:32 +01:00
delivery_failure_tracker_spec.rb After 7 days of repeated delivery failures, give up on inbox () 2017-09-29 03:16:20 +02:00
extractor_spec.rb Spec Extractor () 2017-06-04 14:57:02 +02:00
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 () 2018-10-29 14:05:25 +01:00
hash_object_spec.rb Spec HashObject () 2017-06-04 14:59:52 +02:00
language_detector_spec.rb Leave unknown language as nil if account is remote () 2018-10-05 19:17:46 +02:00
request_spec.rb Fix connect timeout not being enforced () 2018-11-22 20:12:04 +01:00
status_filter_spec.rb Fix regression from - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous () 2017-06-15 02:00:08 +02:00
status_finder_spec.rb Add tests for embeds controller () 2018-06-04 10:35:56 +09:00
tag_manager_spec.rb Append '.test' to hostname in stub data () 2018-04-25 14:12:28 +02:00
user_settings_decorator_spec.rb Enable updating additional account information from user preferences via rest api () 2018-04-08 13:43:10 +02:00
webfinger_resource_spec.rb Fix randomly fail (regression from ) () 2017-06-05 10:03:36 +02:00