fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-16 15:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/spec
History
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
features rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
fixtures Slightly reduce RAM usage (#7301) 2018-05-02 18:58:48 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
lib Add specs for list replies policy 2018-11-28 14:46:07 +01:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
policies Add test to disallow remote users from fetching local-only toots 2018-07-31 15:41:04 +02:00
presenters
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-11-27 13:23:02 +01:00
support
validators Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
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 Disable simplecov on CircleCI (#7416) 2018-05-09 16:59:58 +02:00