monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/models
History
Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 		2024-10-26 13:38:07 +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 Fix `Lint/SymbolConversion` cop (#28175) 2023-12-01 15:53:35 +00:00
web Add endpoint to remove web push subscription (#32626) 2024-10-23 08:02:31 +00:00
account.rb Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02: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 Fix /api/v1/conversations sometimes returning empty accounts (#25499) 2023-06-20 18:32:26 +02:00
account_deletion_request.rb
…
account_domain_block.rb Change algorithm of follow recommendations (#28314) 2023-12-19 10:59:43 +00:00
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 Extract constants for column size length validation limits (#30045) 2024-04-24 08:56:28 +00:00
account_pin.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account_relationship_severance_event.rb Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately (#29714) 2024-03-22 15:44:31 +00:00
account_stat.rb Add `AccountStat.by_recent_status`, use in `Account` (#29704) 2024-03-26 13:12:09 +00:00
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 Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string (#29108) 2024-02-06 17:10:17 +00:00
account_summary.rb Extract scenic view model common methods to concern (#28111) 2024-02-06 09:08:07 +00:00
account_warning.rb Pull out constant from `AccountWarning.recent` scope (#29767) 2024-03-27 14:08:04 +00:00
account_warning_preset.rb
…
admin.rb
…
announcement.rb Change `/api/v1/announcements` to return regular `Status` entities (#26736) 2024-04-17 09:06:23 +00:00
announcement_filter.rb Fix error when passing unknown filter param in REST API (#20626) 2022-11-14 08:06:06 +01:00
announcement_mute.rb
…
announcement_reaction.rb Add `CustomEmoji.enabled` scope (#31830) 2024-09-10 13:21:40 +00:00
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 Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support (#24200) 2023-03-27 17:07:37 +02:00
block.rb Change algorithm of follow recommendations (#28314) 2023-12-19 10:59:43 +00:00
bookmark.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
bulk_import.rb Use enum-generated scopes/queries for `BulkImport` (#29975) 2024-04-18 10:13:35 +00:00
bulk_import_row.rb Rewrite import feature (#21054) 2023-05-02 12:08:48 +02:00
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 Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +02:00
context.rb
…
conversation.rb Add explicit `dependent: nil` to associations (#28169) 2023-12-01 15:52:47 +00:00
conversation_mute.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
custom_emoji.rb Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream 2024-09-16 21:08:58 +02:00
custom_emoji_category.rb Add explicit `dependent: nil` to associations (#28169) 2023-12-01 15:52:47 +00:00
custom_emoji_filter.rb Use Arel `nulls_first` method in ordering CustomEmojiFilter scope (#28614) 2024-01-08 11:09:50 +00:00
custom_filter.rb Remove unused memoization in `CustomFilter#expires_in` method (#30117) 2024-04-29 12:49:31 +00:00
custom_filter_keyword.rb Extract shared callback behaviour to `CustomFilterCache` concern (#29695) 2024-04-05 09:17:58 +00:00
custom_filter_status.rb Extract shared callback behaviour to `CustomFilterCache` concern (#29695) 2024-04-05 09:17:58 +00:00
direct_feed.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
domain_allow.rb Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock (#28803) 2024-01-18 16:11:04 +00:00
domain_block.rb Reinforce coverage for `DomainBlock` model (#32473) 2024-10-14 12:51:01 +00:00
email_domain_block.rb Extract `by_domain_length` scope in `DomainNormalizable` concern (#29517) 2024-03-12 13:09:11 +00:00
export.rb Extract `ExportSummary` class for account object counts (#32227) 2024-10-03 13:09:58 +00:00
extended_description.rb Change about page to be mounted in the web UI (#19345) 2022-10-13 14:42:37 +02:00
favourite.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
featured_tag.rb Add `FeaturedTag` coverage, use `pick` in model (#31828) 2024-09-09 19:57:19 +00:00
feed.rb Remove caching in `cache_collection` (#29862) 2024-04-08 13:46:13 +00:00
follow.rb Change algorithm of follow recommendations (#28314) 2023-12-19 10:59:43 +00:00
follow_recommendation.rb Fix follow recommendation suppressions not applying immediately (#32392) 2024-10-14 08:18:25 +00:00
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 Change algorithm of follow recommendations (#28314) 2023-12-19 10:59:43 +00:00
follow_recommendation_suppression.rb Change algorithm of follow recommendations (#28314) 2023-12-19 10:59:43 +00:00
follow_request.rb Disable `Rails/SkipsModelValidations` cop (#28712) 2024-01-15 13:46:47 +00:00
generated_annual_report.rb Add annual reports for accounts (#28693) 2024-01-24 09:38:10 +00:00
home_feed.rb
…
identity.rb Merge pull request from GHSA-vm39-j3vx-pch3 2024-02-14 15:25:15 +01:00
import.rb Update enum syntax to use the new Rails 7.0 style (#29217) 2024-02-16 14:54:23 +00:00
instance.rb Extract scenic view model common methods to concern (#28111) 2024-02-06 09:08:07 +00:00
instance_filter.rb Fix error when passing unknown filter param in REST API (#20626) 2022-11-14 08:06:06 +01:00
invite.rb Fix `Rails/WhereRange` cop (#30343) 2024-05-20 09:37:36 +00:00
invite_filter.rb Fix error when passing unknown filter param in REST API (#20626) 2022-11-14 08:06:06 +01:00
ip_block.rb Enrich coverage for `IpBlock` model (#32471) 2024-10-25 08:35:07 +00:00
link_feed.rb Fix that blocking was not working on link timeline (#32625) 2024-10-22 12:46:32 +00:00
list.rb Add coverage for title/limit validations in `List` model (#31869) 2024-09-12 13:25:23 +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
…
login_activity.rb Add `BrowserDetection` model concern (#29513) 2024-03-19 15:39:14 +00:00
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 Change algorithm of follow recommendations (#28314) 2023-12-19 10:59:43 +00:00
notification.rb Add notification grouping for follow notifications (#32085) 2024-09-25 13:36:19 +00:00
notification_group.rb Fix N+1s in grouped notifications (#31638) 2024-09-02 09:56:00 +00:00
notification_permission.rb Add notification policies and notification requests (#29366) 2024-03-07 14:53:37 +00:00
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
poll.rb Fix `Rails/WhereExists` cop in app/models (#28863) 2024-01-24 09:57:49 +00:00
poll_vote.rb Fix single-record invalid condition on PollVote (#23810) 2023-02-27 09:31:15 +01:00
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_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 Add `not_allowed` scope for `PreviewCardTrend` (#29599) 2024-03-26 13:21:20 +00:00
preview_cards_status.rb Change algorithm of follow recommendations (#28314) 2023-12-19 10:59:43 +00:00
privacy_policy.rb Move privacy policy into markdown file (#28699) 2024-01-19 11:22:23 +00:00
public_feed.rb Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
relationship_filter.rb Add `AccountStat.by_recent_status`, use in `Account` (#29704) 2024-03-26 13:12:09 +00:00
relationship_severance_event.rb Update `enum` away from deprecated (#29678) 2024-03-21 08:32:35 +00:00
relay.rb Update enum syntax to use the new Rails 7.0 style (#29217) 2024-02-16 14:54:23 +00:00
remote_follow.rb Extract wrapper constant for `HTTP::*` error classes (#32285) 2024-10-08 13:53:35 +00:00
report.rb Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +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
rule.rb Extract constants for column size length validation limits (#30045) 2024-04-24 08:56:28 +00:00
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 Clean up `Setting` model and remove dead code (#28661) 2024-01-09 14:01:53 +00:00
severed_relationship.rb Use existing `SeveredRelationship.about_local_account` scope in more places (#29673) 2024-03-21 08:36:49 +00:00
site_upload.rb Drop favicon.ico generation (#30375) 2024-06-26 13:44:08 +00:00
software_update.rb Update enum syntax to use the new Rails 7.0 style (#29217) 2024-02-16 14:54:23 +00:00
status.rb Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
status_edit.rb Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
status_pin.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
status_stat.rb Fix obsolete cache key in status cache invalidation logic (#26934) 2023-09-15 19:52:28 +02:00
status_trend.rb Add `RankedTrend` concern for trends classes (#29388) 2024-02-26 13:45:39 +00:00
tag.rb Add `reviewed` and `unreviewed` scopes to `Reviewable` model concern (#31988) 2024-09-20 08:51:37 +00:00
tag_feed.rb Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
tag_follow.rb Add ability to follow hashtags (#18809) 2022-07-17 13:49:29 +02:00
tombstone.rb
…
translation.rb Translate CW, poll options and media descriptions (#24175) 2023-06-01 00:10:21 +02:00
trends.rb Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream 2023-07-12 15:38:35 +02:00
unavailable_domain.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
user.rb Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00
user_invite_request.rb Extract constants for column size length validation limits (#30045) 2024-04-24 08:56:28 +00:00
user_ip.rb Add `by_latest_used` scope, move admin area recent IPs to partial (#29497) 2024-04-02 13:51:34 +00:00
user_role.rb Move `nobody` position in `UserRole` magic number to constant (#29465) 2024-03-01 11:05:24 +00:00
user_settings.rb Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +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 Use `normalizes` to prepare `Webhook#events` value (#27605) 2023-11-13 22:47:44 +00:00