mastodon/spec
Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
2019-06-10 18:59:53 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
features
fixtures
helpers
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-06-07 17:00:36 +02:00
mailers
models Update remote bio test from 160 to 500 (#10799) 2019-05-21 13:29:06 +02:00
policies
presenters
requests
routing
serializers/activitypub
services Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-03 14:54:30 +02:00
support
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
views
workers
rails_helper.rb
spec_helper.rb