Glitch-Shrike/spec/controllers/settings
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
..
exports
preferences
two_factor_authentication
applications_controller_spec.rb
deletes_controller_spec.rb
exports_controller_spec.rb
flavours_controller_spec.rb
identity_proofs_controller_spec.rb
imports_controller_spec.rb
migrations_controller_spec.rb
profiles_controller_spec.rb
sessions_controller_spec.rb
two_factor_authentications_controller_spec.rb