mastodon-glitch/spec
Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
..
controllers
fabricators
features
fixtures
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
lib
mailers
models
policies
presenters
requests
routing
serializers/activitypub
services Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
support
validators
views
workers Add domain block notes (#11515) 2019-08-07 20:20:23 +02:00
rails_helper.rb
spec_helper.rb