luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 04:39:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec
History
Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
features rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
fixtures
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-10-29 14:09:54 +01:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
policies Add test to disallow remote users from fetching local-only toots 2018-07-31 15:41:04 +02:00
presenters
requests
routing
services Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00
support
validators
views Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
workers
rails_helper.rb rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
spec_helper.rb