You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/spec
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
7 years ago
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
fabricators Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
features rubocop issues - Cleaning up (#8912) 7 years ago
fixtures Fix undefined method error in sidekiq (#9807) 7 years ago
helpers Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
lib Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
mailers Improve e-mail digest (#9689) 7 years ago
models Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
policies Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
presenters Change instance_presenter_spec to point to glitch-soc instead of tootsuite 7 years ago
requests
routing
serializers/activitypub Improved remote thread fetching (#10106) 7 years ago
services Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
support
validators Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
views Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
workers Improved remote thread fetching (#10106) 7 years ago
rails_helper.rb Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819) 7 years ago
spec_helper.rb