FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/spec
History
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb

Resolved by taking both changes (not a real conflict, just changes too close
to each other).
 		2018-11-27 13:23:02 +01:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01: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-11-27 13:23:02 +01:00
mailers
…
models Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01: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-11-27 13:23:02 +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
…