1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-14 06:38:39 +09:00
YuruToot/app/validators
Claire d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02:00
..
blacklisted_email_validator.rb Change e-mail domain blocks to block IPs dynamically (#17635) 2022-02-24 17:28:23 +01:00
disallowed_hashtags_validator.rb Change admin UI for hashtags and add back whitelisted trends (#11490) 2019-08-05 19:54:29 +02:00
domain_validator.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
ed25519_key_validator.rb Misc coverage improvements for validators (#23928) 2023-03-04 17:00:00 +01:00
ed25519_signature_validator.rb Misc coverage improvements for validators (#23928) 2023-03-04 17:00:00 +01:00
email_mx_validator.rb Fix Lint/DuplicateBranch cop (#24766) 2023-05-02 12:57:11 +02:00
existing_username_validator.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
follow_limit_validator.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
language_validator.rb Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
note_length_validator.rb Fix URL scanning in note length validator and preview card fetching (#15827) 2021-03-04 00:12:26 +01:00
poll_validator.rb Support customizing poll option limits 2021-01-26 14:07:31 +01:00
reaction_validator.rb Minor memory optimizations (#16507) 2021-10-14 21:04:57 +02:00
registration_form_time_validator.rb Add honeypot fields and minimum fill-out time for sign-up form (#15276) 2020-12-10 06:27:26 +01:00
status_length_validator.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-30 15:02:56 +02:00
status_pin_validator.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
unique_username_validator.rb Add details to error response for POST /api/v1/accounts in REST API (#15803) 2021-03-01 04:59:13 +01:00
unreserved_username_validator.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
url_validator.rb Strip spaces around URL when adding a relay (#22655) 2023-01-05 13:33:33 +01:00
vote_validator.rb Fix Lint/DuplicateBranch cop (#24766) 2023-05-02 12:57:11 +02:00