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

..

activitypub

…

admin

…

api

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-23 10:51:07 +02:00

auth

…

concerns

…

oauth

…

settings

Merge branch 'master' into glitch-soc/merge-upstream

2019-08-30 13:38:41 +02:00

well_known

…

about_controller_spec.rb

…

account_follow_controller_spec.rb

…

account_unfollow_controller_spec.rb

…

accounts_controller_spec.rb

…

application_controller_spec.rb

…

authorize_interactions_controller_spec.rb

…

emojis_controller_spec.rb

…

follower_accounts_controller_spec.rb

…

following_accounts_controller_spec.rb

…

home_controller_spec.rb

…

intents_controller_spec.rb

…

invites_controller_spec.rb

…

manifests_controller_spec.rb

…

media_controller_spec.rb

…

relationships_controller_spec.rb

…

remote_follow_controller_spec.rb

…

remote_interaction_controller_spec.rb

…

shares_controller_spec.rb

…

statuses_controller_spec.rb

…

tags_controller_spec.rb

…