tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
mastodon/spec
History
Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +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-23 10:51:07 +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-23 10:51:07 +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-07-23 10:51:07 +02:00
policies
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-23 10:51:07 +02:00
presenters
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-14 17:17:20 +01:00
requests
Refactor controllers for statuses, accounts, and more (#11249)
2019-07-08 12:03:45 +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-07-23 10:51:07 +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-05-19 21:53:44 +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