tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
ba365ac8ec1deede2b28ef5884d06a18d8f144ed
Mastodon/app/models
T
History
Claire 6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
2024-10-19 19:13:32 +02:00
..
account
Change Account::Field parsing to use HTML5::DocumentFragment (#31813)
2024-09-08 18:56:18 +00:00
account_suggestions
Fix in memoriam accounts appearing in follow recommendations (#31474)
2024-08-19 15:55:42 +00:00
admin
Remove unneeded reorder(nil) conditions (#32200)
2024-10-02 12:26:16 +00:00
concerns
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
form
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
trends
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
user_settings
…
web
Extract WebPushRequest from push notification worker and subscription (#32208)
2024-10-02 11:11:52 +00:00
account_alias.rb
Add OpenSSL::SSL::SSLError to http connection errors wrapper (#32307)
2024-10-08 14:59:51 +00:00
account_conversation.rb
…
account_deletion_request.rb
…
account_domain_block.rb
…
account_filter.rb
Remove unneeded reorder(nil) conditions (#32200)
2024-10-02 12:26:16 +00:00
account_migration.rb
Add OpenSSL::SSL::SSLError to http connection errors wrapper (#32307)
2024-10-08 14:59:51 +00:00
account_moderation_note.rb
Fix sort order of moderation notes on Reports and Accounts (#31528)
2024-09-06 14:58:36 +00:00
account_note.rb
…
account_pin.rb
…
account_relationship_severance_event.rb
…
account_stat.rb
…
account_statuses_cleanup_policy.rb
Add method for media-referencing status in AccountStatusCleanupPolicy (#31798)
2024-09-09 08:33:51 +00:00
account_suggestions.rb
…
account_summary.rb
…
account_warning_preset.rb
…
account_warning.rb
…
account.rb
Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream
2024-10-07 20:45:07 +02:00
admin.rb
…
announcement_filter.rb
…
announcement_mute.rb
…
announcement_reaction.rb
Add CustomEmoji.enabled scope (#31830)
2024-09-10 13:21:40 +00:00
announcement.rb
…
appeal.rb
Extract TEXT_LENGTH_LIMIT constant in Appeal class (#30638)
2024-06-10 15:23:17 +00:00
application_record.rb
Prevent accidental serialization of Account and User records (#30079)
2024-04-29 09:45:58 +00:00
backup.rb
…
block.rb
…
bookmark.rb
…
bulk_import_row.rb
…
bulk_import.rb
…
canonical_email_block.rb
Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385)
2024-05-21 08:56:08 +00:00
content_retention_policy.rb
…
context.rb
…
conversation_mute.rb
…
conversation.rb
…
custom_emoji_category.rb
…
custom_emoji_filter.rb
…
custom_emoji.rb
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
2024-09-16 21:08:58 +02:00
custom_filter_keyword.rb
…
custom_filter_status.rb
…
custom_filter.rb
Remove unused memoization in CustomFilter#expires_in method (#30117)
2024-04-29 12:49:31 +00:00
direct_feed.rb
…
domain_allow.rb
…
domain_block.rb
Reinforce coverage for DomainBlock model (#32473)
2024-10-14 12:51:01 +00:00
email_domain_block.rb
…
export.rb
Extract ExportSummary class for account object counts (#32227)
2024-10-03 13:09:58 +00:00
extended_description.rb
…
favourite.rb
…
featured_tag.rb
Add FeaturedTag coverage, use pick in model (#31828)
2024-09-09 19:57:19 +00:00
feed.rb
…
follow_recommendation_filter.rb
Fix follow recommendation moderation page default language when using regional variant (#32580)
2024-10-18 10:21:25 +00:00
follow_recommendation_mute.rb
…
follow_recommendation_suppression.rb
…
follow_recommendation.rb
Fix follow recommendation suppressions not applying immediately (#32392)
2024-10-14 08:18:25 +00:00
follow_request.rb
…
follow.rb
…
generated_annual_report.rb
…
home_feed.rb
…
identity.rb
…
import.rb
…
instance_filter.rb
…
instance.rb
…
invite_filter.rb
…
invite.rb
Fix Rails/WhereRange cop (#30343)
2024-05-20 09:37:36 +00:00
ip_block.rb
…
link_feed.rb
Add timeline of public posts about a trending link to REST API (#30381)
2024-06-06 08:43:04 +00:00
list_account.rb
Add coverage for ListAccount follow/follow_request set up (#31896)
2024-09-13 08:49:03 +00:00
list_feed.rb
…
list.rb
Add coverage for title/limit validations in List model (#31869)
2024-09-12 13:25:23 +00:00
login_activity.rb
…
marker.rb
…
media_attachment.rb
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
mention.rb
Remove unused Mention#active? method (#31697)
2024-09-03 08:03:25 +00:00
mute.rb
…
notification_group.rb
Fix N+1s in grouped notifications (#31638)
2024-09-02 09:56:00 +00:00
notification_permission.rb
…
notification_policy.rb
Fix notification requests from suspended accounts still being listed (#32354)
2024-10-09 17:29:02 +00:00
notification_request.rb
Fix notification requests from suspended accounts still being listed (#32354)
2024-10-09 17:29:02 +00:00
notification.rb
Add notification grouping for follow notifications (#32085)
2024-09-25 13:36:19 +00:00
poll_vote.rb
…
poll.rb
…
preview_card_provider.rb
Add reviewed and unreviewed scopes to Reviewable model concern (#31988)
2024-09-20 08:51:37 +00:00
preview_card_trend.rb
…
preview_card.rb
Increase preview card image size limit from 2MB to 8MB when using libvips (#31904)
2024-09-14 00:16:02 +00:00
preview_cards_status.rb
…
privacy_policy.rb
…
public_feed.rb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
relationship_filter.rb
…
relationship_severance_event.rb
…
relay.rb
…
remote_follow.rb
Extract wrapper constant for HTTP::* error classes (#32285)
2024-10-08 13:53:35 +00:00
report_filter.rb
Add relevant_params to ReportFilter (matches account filter) (#32136)
2024-10-02 13:24:40 +00:00
report_note.rb
Fix sort order of moderation notes on Reports and Accounts (#31528)
2024-09-06 14:58:36 +00:00
report.rb
Add optional OAuth application to reports (#30539)
2024-07-16 13:23:08 +00:00
rule.rb
…
scheduled_status.rb
…
search.rb
…
session_activation.rb
Clean up labels on development application form (#32116)
2024-10-02 14:45:12 +00:00
setting.rb
…
severed_relationship.rb
…
site_upload.rb
Drop favicon.ico generation (#30375)
2024-06-26 13:44:08 +00:00
software_update.rb
…
status_edit.rb
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
status_pin.rb
…
status_stat.rb
…
status_trend.rb
…
status.rb
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
tag_feed.rb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
tag_follow.rb
…
tag.rb
Add reviewed and unreviewed scopes to Reviewable model concern (#31988)
2024-09-20 08:51:37 +00:00
tombstone.rb
…
translation.rb
…
trends.rb
…
unavailable_domain.rb
…
user_invite_request.rb
…
user_ip.rb
…
user_role.rb
…
user_settings.rb
Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream
2024-07-12 13:41:54 +02:00
user.rb
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
2024-10-06 16:07:58 +02:00
web.rb
…
webauthn_credential.rb
Extract SIGN_COUNT_LIMIT constant in WebauthnCredential class (#30636)
2024-06-11 15:36:21 +00:00
webhook.rb
…