FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/models
History
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
..
account Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account_suggestions Fix Performance/MethodObjectAsBlock cop (#24798) 2023-05-03 10:30:54 +02:00
admin Fix Performance/CollectionLiteralInLoop cop (#24819) 2023-05-04 05:33:55 +02:00
concerns Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
form Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
trends Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
user_settings Wrong type for user setting when default is defined by lambda (#24321) 2023-03-31 07:33:17 +02:00
web Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account.rb Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
account_alias.rb Micro-optimization: only split `acct` into two Strings (#19901) 2022-11-07 16:17:55 +01:00
account_conversation.rb Fix Rails/ActiveRecordCallbacksOrder cop (#24689) 2023-05-02 18:23:35 +02:00
account_deletion_request.rb
…
account_domain_block.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account_filter.rb Change moderation search an account using the username with @ (#24242) 2023-04-17 14:16:36 +02:00
account_migration.rb Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741) 2023-05-02 18:16:07 +02:00
account_moderation_note.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account_note.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account_pin.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account_stat.rb Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761) 2023-03-31 15:07:22 +02:00
account_statuses_cleanup_policy.rb Minor clean up and optimization of the automatic post deletion code (#24613) 2023-04-21 16:53:50 +02:00
account_statuses_filter.rb Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
account_suggestions.rb Change auto-following admin-selected accounts, show in recommendations (#16078) 2021-04-24 17:01:43 +02:00
account_summary.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account_warning.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account_warning_preset.rb
…
admin.rb
…
announcement.rb Autofix Rubocop Rails/WhereEquals (#23759) 2023-02-21 03:20:56 +09: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 Fix Rails/ActiveRecordCallbacksOrder cop (#24689) 2023-05-02 18:23:35 +02:00
appeal.rb Fix Rails/InverseOf cop (#24732) 2023-04-30 14:06:53 +02:00
application_record.rb
…
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 Fix Rails/ActiveRecordCallbacksOrder cop (#24689) 2023-05-02 18:23:35 +02:00
bookmark.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
bulk_import.rb Rewrite import feature (#21054) 2023-05-02 12:08:48 +02:00
bulk_import_row.rb Rewrite import feature (#21054) 2023-05-02 12:08:48 +02:00
canonical_email_block.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01: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 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
conversation_mute.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
custom_emoji.rb Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 2023-05-08 15:28:36 +02:00
custom_emoji_category.rb
…
custom_emoji_filter.rb Fix error when passing unknown filter param in REST API (#20626) 2022-11-14 08:06:06 +01:00
custom_filter.rb Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761) 2023-03-31 15:07:22 +02:00
custom_filter_keyword.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
custom_filter_status.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
device.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
direct_feed.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
domain_allow.rb Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2022-11-17 11:05:09 +01:00
domain_block.rb Fix Rails/InverseOf cop (#24732) 2023-04-30 14:06:53 +02:00
email_domain_block.rb Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761) 2023-03-31 15:07:22 +02:00
encrypted_message.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
export.rb Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02: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 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
feed.rb
…
follow.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
follow_recommendation.rb Fix Rails/InverseOf cop (#24732) 2023-04-30 14:06:53 +02:00
follow_recommendation_filter.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
follow_recommendation_suppression.rb Upgrade to latest redis-rb 4.x and fix deprecations (#23616) 2023-03-04 16:38:28 +01:00
follow_request.rb Change lists to be able to include accounts with pending follow requests (#19727) 2023-05-02 14:40:36 +02:00
home_feed.rb Revert support from loading Home timeline from database 2022-04-19 15:06:38 +02:00
identity.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
import.rb Rewrite import feature (#21054) 2023-05-02 12:08:48 +02:00
instance.rb Fix Rails/InverseOf cop (#24732) 2023-04-30 14:06:53 +02: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 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01: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 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
list.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
list_account.rb Fix various edge cases with local moves (#24812) 2023-05-03 19:19:25 +02:00
list_feed.rb
…
login_activity.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
marker.rb
…
media_attachment.rb Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
mention.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
message_franking.rb
…
mute.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
notification.rb Fix Rails/InverseOf cop (#24732) 2023-04-30 14:06:53 +02:00
one_time_key.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
poll.rb Fix Rails/CompactBlank cop (#24690) 2023-04-30 14:07:21 +02:00
poll_vote.rb Fix single-record invalid condition on PollVote (#23810) 2023-02-27 09:31:15 +01:00
preview_card.rb Change media upload limits and remove client-side resizing (#23726) 2023-03-25 10:00:03 +01:00
preview_card_provider.rb Add trend management to admin API (#24257) 2023-04-18 11:33:30 +02:00
preview_card_trend.rb Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
privacy_policy.rb Fix privacy policy being empty if custom setting exists but is empty (#19318) 2022-10-08 08:34:00 +02:00
public_feed.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
relationship_filter.rb Fix Performance/CollectionLiteralInLoop cop (#24819) 2023-05-04 05:33:55 +02:00
relay.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
remote_follow.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
report.rb Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761) 2023-03-31 15:07:22 +02:00
report_filter.rb Fix error when passing unknown filter param in REST API (#20626) 2022-11-14 08:06:06 +01:00
report_note.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
rule.rb Fix rules with same priority being sorted non-deterministically (#20623) 2022-11-14 06:28:19 +01:00
scheduled_status.rb
…
search.rb
…
session_activation.rb Fix Rails/ActiveRecordCallbacksOrder cop (#24689) 2023-05-02 18:23:35 +02:00
setting.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
site_upload.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
status.rb Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
status_edit.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
status_pin.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
status_stat.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
status_trend.rb Fix trending statuses returning more than one post by the same author (#19349) 2022-10-14 01:44:23 +02:00
system_key.rb Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681) 2023-02-18 04:30:23 +01:00
tag.rb fixed typo in a constant name (#24511) 2023-04-12 10:06:57 +02:00
tag_feed.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
tag_follow.rb Add ability to follow hashtags (#18809) 2022-07-17 13:49:29 +02:00
tombstone.rb
…
trends.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
unavailable_domain.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
user.rb Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 2023-05-08 15:28:36 +02:00
user_invite_request.rb
…
user_ip.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
user_role.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
user_settings.rb Migrate glitch-soc's exclusive user settings 2023-03-31 22:50:57 +02:00
web.rb
…
webauthn_credential.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
webhook.rb Webhooks for local status.create, status.update, account.update (#24133) 2023-03-19 07:47:54 +01:00