tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
6fdd596cc88622abc585ef3da96699f8f987dfb5
Mastodon/app/models
History
Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them.
2023-02-19 10:42:55 +01:00
..
account
Autofix Rubocop Style/RedundantBegin (#23703)
2023-02-19 07:09:40 +09:00
account_suggestions
Fix admin-set follow recommandations being case-sensitive (#23500)
2023-02-10 11:14:58 +01:00
admin
Autofix Rubocop Style/RedundantBegin (#23703)
2023-02-19 07:09:40 +09:00
concerns
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-19 10:42:55 +01:00
form
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-19 10:42:55 +01:00
trends
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-19 10:42:55 +01:00
web
Autofix Rubocop Style/RedundantBegin (#23703)
2023-02-19 07:09:40 +09:00
account_alias.rb
Micro-optimization: only split acct into two Strings (#19901)
2022-11-07 16:17:55 +01:00
account_conversation.rb
…
account_deletion_request.rb
…
account_domain_block.rb
…
account_filter.rb
Add "disabled" user filter for admin/accounts UI (#21282)
2022-12-15 17:30:47 +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
…
account_note.rb
…
account_pin.rb
…
account_stat.rb
…
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
…
account_warning_preset.rb
…
account_warning.rb
Fix Account Strike causing PG not null validation error (#23178)
2023-01-21 10:22:22 +01:00
account.rb
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-19 10:42:55 +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 Style/RedundantBegin (#23703)
2023-02-19 07:09:40 +09:00
appeal.rb
…
application_record.rb
…
backup.rb
Upgrade to Ruby 3.2 (#22928)
2023-02-15 08:30:27 +01:00
block.rb
…
bookmark.rb
…
canonical_email_block.rb
…
content_retention_policy.rb
…
context.rb
…
conversation_mute.rb
…
conversation.rb
…
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
2022-11-12 13:28:03 +01:00
custom_filter_keyword.rb
…
custom_filter_status.rb
…
custom_filter.rb
Fix irreversible and whole_word parameters handling in /api/v1/filters (#21988)
2022-12-07 00:10:53 +01:00
device.rb
…
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
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
email_domain_block.rb
Autofix Rubocop Style/RedundantBegin (#23703)
2023-02-19 07:09:40 +09:00
encrypted_message.rb
…
export.rb
…
extended_description.rb
…
favourite.rb
…
featured_tag.rb
Improve performance by avoiding regex construction (#20215)
2022-11-10 05:49:30 +01:00
feed.rb
…
follow_recommendation_filter.rb
…
follow_recommendation_suppression.rb
…
follow_recommendation.rb
…
follow_request.rb
…
follow.rb
…
home_feed.rb
…
identity.rb
…
import.rb
…
instance_filter.rb
Fix error when passing unknown filter param in REST API (#20626)
2022-11-14 08:06:06 +01:00
instance.rb
…
invite_filter.rb
Fix error when passing unknown filter param in REST API (#20626)
2022-11-14 08:06:06 +01:00
invite.rb
…
ip_block.rb
…
list_account.rb
…
list_feed.rb
…
list.rb
…
login_activity.rb
…
marker.rb
…
media_attachment.rb
Merge branch 'main' into glitch-soc/merge-upstream
2022-12-15 20:25:25 +01:00
mention.rb
…
message_franking.rb
…
mute.rb
…
notification.rb
Autofix Rubocop Style/RedundantBegin (#23703)
2023-02-19 07:09:40 +09:00
one_time_key.rb
…
poll_vote.rb
…
poll.rb
Clear voter count when poll is reset (#21700)
2022-11-26 23:08:25 +01:00
preview_card_provider.rb
Fix metadata scrubbing removing color profile from images (#20389)
2022-11-11 09:20:10 +01:00
preview_card_trend.rb
…
preview_card.rb
Fix metadata scrubbing removing color profile from images (#20389)
2022-11-11 09:20:10 +01:00
privacy_policy.rb
…
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
Strip spaces around URL when adding a relay (#22655)
2023-01-05 13:33:33 +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
…
report.rb
…
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
Apply Rubocop Rails/WhereNot (#23448)
2023-02-08 10:39:57 +01:00
setting.rb
Apply Rubocop Style/RedundantAssignment (#23452)
2023-02-08 07:06:50 +01:00
site_upload.rb
Fix metadata scrubbing removing color profile from images (#20389)
2022-11-11 09:20:10 +01:00
status_edit.rb
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-19 10:42:55 +01:00
status_pin.rb
…
status_stat.rb
…
status_trend.rb
…
status.rb
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-19 10:42:55 +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
…
tag.rb
Autofix Rubocop Style/Lambda (#23696)
2023-02-18 12:39:00 +01:00
tombstone.rb
…
trends.rb
…
unavailable_domain.rb
…
user_invite_request.rb
…
user_ip.rb
…
user_role.rb
…
user.rb
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-09 12:46:12 +01:00
web.rb
…
webauthn_credential.rb
Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681)
2023-02-18 04:30:23 +01:00
webhook.rb
Add webhook account.approved (#22938)
2023-01-05 13:29:49 +01:00