mastodon/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 Export and import show_reblogs together with following list (#10495) 2019-04-08 07:28:27 +02:00
preferences Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988) 2019-06-07 16:51:08 +02:00
two_factor_authentication Fix uncaught parameter missing exceptions and missing error templates (#11702) 2019-08-30 01:34:47 +02:00
applications_controller_spec.rb
deletes_controller_spec.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00
exports_controller_spec.rb Add spec for Settings::ExportsController#create (#9512) 2018-12-13 02:53:52 +01:00
flavours_controller_spec.rb
identity_proofs_controller_spec.rb Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489) 2019-08-06 15:33:03 +02:00
imports_controller_spec.rb
migrations_controller_spec.rb
profiles_controller_spec.rb Error message for avatar image that's too large. #9204 (#9518) 2018-12-14 05:07:21 +01:00
sessions_controller_spec.rb
two_factor_authentications_controller_spec.rb Fix uncaught parameter missing exceptions and missing error templates (#11702) 2019-08-30 01:34:47 +02:00