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/controllers/settings
Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.
5 years ago
..
exports Add import/export feature for bookmarks (#14956) 5 years ago
preferences
two_factor_authentication
applications_controller_spec.rb
deletes_controller_spec.rb Refactor settings controllers (#14767) 5 years ago
exports_controller_spec.rb
featured_tags_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_authentication_methods_controller_spec.rb