mastodon/spec
Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
2019-08-07 13:56:48 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +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-08-05 13:13:28 +02:00
mailers Add invite request to pending account notification e-mail (#10528) 2019-04-10 00:36:01 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
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-07-28 16:28:05 +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 Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
rails_helper.rb Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819) 2019-01-15 23:11:46 +01:00
spec_helper.rb Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00