monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec/system/settings
History
Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
 		2025-01-10 20:41:36 +01:00
..
preferences Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
applications_spec.rb Convert `settings/applications` controller spec to system/request specs (#32006) 2024-09-23 13:37:32 +00:00
exports_spec.rb Convert `settings/exports` controller spec to system/request specs (#31965) 2024-09-19 13:43:40 +00:00
login_activities_spec.rb Convert `settings/login_activities` controller spec to system spec (#33306) 2024-12-16 08:12:36 +00:00
migrations_spec.rb Convert `settings/migration` spec controller->system (#33496) 2025-01-08 08:53:26 +00:00
profiles_spec.rb Convert `settings/profiles` controller spec to system spec (#33305) 2024-12-16 08:11:48 +00:00
verifications_spec.rb Convert `settings/verifications` controller spec to system spec (#33285) 2024-12-13 10:39:07 +00:00