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 ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
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 Export and import show_reblogs together with following list (#10495) 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 Add invite request to pending account notification e-mail (#10528) 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 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
requests Redesign landing page (#10232) 7 years ago
routing
serializers/activitypub Improved remote thread fetching (#10106) 7 years ago
services Merge remote-tracking branch 'upstream/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