mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-02-07 09:48:20 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/spec
History
Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
..
controllers
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-29 12:07:50 +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 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-08-29 12:07:50 +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
Move create/destroy actions for api/v1/statuses to namespace (#3678)
2017-06-10 09:39:26 +02:00
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
Remove empty strings (#5732)
2017-11-17 10:52:30 +09:00
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
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