mastodon-glitch/spec
Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.
2019-08-30 13:38:41 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
features
fixtures
helpers
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-08-05 13:13:28 +02:00
mailers Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
presenters
requests Remove XML version of Webfinger and remove links to Atom feeds (#11460) 2019-08-01 19:14:02 +02:00
routing
serializers/activitypub
services Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
support
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
views
workers Add domain block notes (#11515) 2019-08-07 20:20:23 +02:00
rails_helper.rb
spec_helper.rb