tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/models
History
Claire 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream added lines close to a glitch-soc only line, not a real conflict.
  Applied upstream's changes (added hooks) while keeping glitch-soc's changes
  (`local_only` scope).
- `config/environments/production.rb`:
  Upstream removed a header, while we have glitch-soc specific ones.
  Removed the header removed upstream.
2023-03-22 19:50:11 +01:00
..
account
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account_suggestions
Fix admin-set follow recommandations being case-sensitive (#23500)
2023-02-10 11:14:58 +01:00
admin
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
concerns
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-22 19:50:11 +01:00
form
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-05 20:46:56 +01:00
trends
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-19 10:42:55 +01:00
web
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account_alias.rb
Micro-optimization: only split acct into two Strings (#19901)
2022-11-07 16:17:55 +01:00
account_conversation.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01: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
Fix deprecation warning about merging conditions (#23618)
2023-03-02 16:21:04 +01:00
account_migration.rb
Fix 500 error when trying to migrate to an invalid address (#21462)
2022-12-07 02:35:39 +01: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 remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account_statuses_cleanup_policy.rb
Autofix Rubocop Style/IfUnlessModifier (#23697)
2023-02-18 12:37:47 +01:00
account_statuses_filter.rb
…
account_suggestions.rb
…
account_summary.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account_warning_preset.rb
…
account_warning.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account.rb
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-22 19:50:11 +01:00
admin.rb
…
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
…
announcement.rb
Autofix Rubocop Rails/WhereEquals (#23759)
2023-02-21 03:20:56 +09:00
appeal.rb
Add audit log entries for user roles (#19040)
2022-08-25 20:39:40 +02:00
application_record.rb
…
backup.rb
Change user backups to use expiring URLs for download when possible (#24136)
2023-03-16 22:46:52 +01:00
block.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
bookmark.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01: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_mute.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
conversation.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01: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_emoji.rb
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-25 14:00:40 +01: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
custom_filter.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
…
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
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
email_domain_block.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01: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_recommendation_filter.rb
…
follow_recommendation_suppression.rb
Upgrade to latest redis-rb 4.x and fix deprecations (#23616)
2023-03-04 16:38:28 +01:00
follow_recommendation.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
follow_request.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
follow.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
home_feed.rb
…
identity.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
import.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
instance_filter.rb
Fix error when passing unknown filter param in REST API (#20626)
2022-11-14 08:06:06 +01:00
instance.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
invite.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
ip_block.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
list_account.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
list_feed.rb
…
list.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
login_activity.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
marker.rb
…
media_attachment.rb
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-25 14:00:40 +01: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
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
one_time_key.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
poll_vote.rb
Fix single-record invalid condition on PollVote (#23810)
2023-02-27 09:31:15 +01:00
poll.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
preview_card_provider.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
preview_card_trend.rb
Add support for language preferences for trending statuses and links (#18288)
2022-10-08 16:45:40 +02:00
preview_card.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01: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 error when passing unknown filter param in REST API (#20626)
2022-11-14 08:06:06 +01: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_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
report.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
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01: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_edit.rb
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-25 14:00:40 +01: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
status.rb
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-22 19:50:11 +01:00
system_key.rb
Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681)
2023-02-18 04:30:23 +01: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
tag.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01: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_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.rb
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-15 09:16:10 +01: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