mastodon/spec
Thibaut Girka 7b435fd9bf Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
2020-03-27 21:54:44 +01:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
fabricators
features Add submit button to the top of preferences pages (#13068) 2020-03-08 16:04:03 +01:00
fixtures
helpers
lib Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe” 2020-03-24 12:07:47 +01:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2020-02-03 09:22:58 +01:00
policies
presenters
requests
routing
serializers/activitypub
services Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
support
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-02-03 09:22:58 +01:00
views
workers
rails_helper.rb Bump sidekiq from 5.2.7 to 6.0.4 (#11727) 2020-03-21 12:04:54 +09:00
spec_helper.rb