mastodon/spec
Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
features Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00
fixtures Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-07-28 16:28:05 +02:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
presenters
requests Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00
routing
serializers/activitypub Fix account URI in UpdatePollSerializer (#11194) 2019-06-27 19:41:55 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-07-28 16:28:05 +02:00
support
validators
views Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
workers Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
rails_helper.rb
spec_helper.rb Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00