mastodon/spec
Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +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-09-18 17:25:56 +02:00
mailers Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
presenters
requests Remove XML version of Webfinger and remove links to Atom feeds (#11460) 2019-08-01 19:14:02 +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-08-19 21:49:35 +02:00
support
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
workers Add domain block notes (#11515) 2019-08-07 20:20:23 +02:00
rails_helper.rb
spec_helper.rb Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00