luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-25 16:24:00 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec
History
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
2018-08-17 17:43:54 +02:00
..
controllers Update Rails (#8141) 2018-08-13 18:17:20 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
features
fixtures Slightly reduce RAM usage (#7301) 2018-05-02 18:58:48 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
mailers Account archive download (#6460) 2018-02-21 23:21:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
policies Add test to disallow remote users from fetching local-only toots 2018-07-31 15:41:04 +02:00
presenters Isolate each specs for cache store (#6450) 2018-02-17 22:35:05 +01:00
requests Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
routing
services Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
support Remove empty strings (#5732) 2017-11-17 10:52:30 +09:00
validators Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
workers Lists (#5703) 2017-11-18 00:16:48 +01:00
rails_helper.rb Slightly reduce RAM usage (#7301) 2018-05-02 18:58:48 +02:00
spec_helper.rb Disable simplecov on CircleCI (#7416) 2018-05-09 16:59:58 +02:00