Claire c943f17b1b Merge branch 'main' into glitch-soc/merge-upstream

2023-07-17 12:52:15 +02:00

..

account

…

account_suggestions

…

admin

…

concerns

Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream

2023-07-13 13:35:15 +02:00

form

…

trends

Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

2023-07-12 16:03:05 +02:00

user_settings

…

web

…

account_alias.rb

Fix Style/SlicingWithRange cop (#25923)

2023-07-12 10:03:06 +02:00

account_conversation.rb

…

account_deletion_request.rb

…

account_domain_block.rb

…

account_filter.rb

…

account_migration.rb

…

account_moderation_note.rb

…

account_note.rb

…

account_pin.rb

…

account_stat.rb

…

account_statuses_cleanup_policy.rb

…

account_statuses_filter.rb

…

account_suggestions.rb

…

account_summary.rb

…

account_warning_preset.rb

…

account_warning.rb

…

account.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-07-02 11:49:08 +02:00

admin.rb

…

announcement_filter.rb

…

announcement_mute.rb

…

announcement_reaction.rb

…

announcement.rb

Rails 7.0 update (#25668)

2023-07-13 09:36:07 +02:00

appeal.rb

…

application_record.rb

Fix not actually connecting to the configured replica (#25977)

2023-07-17 08:26:52 +02:00

backup.rb

…

block.rb

…

bookmark.rb

…

bulk_import_row.rb

…

bulk_import.rb

…

canonical_email_block.rb

…

content_retention_policy.rb

…

context.rb

…

conversation_mute.rb

…

conversation.rb

…

custom_emoji_category.rb

…

custom_emoji_filter.rb

…

custom_emoji.rb

…

custom_filter_keyword.rb

…

custom_filter_status.rb

…

custom_filter.rb

…

device.rb

…

direct_feed.rb

…

domain_allow.rb

…

domain_block.rb

Fix Style/SlicingWithRange cop (#25923)

2023-07-12 10:03:06 +02:00

email_domain_block.rb

Fix Style/SlicingWithRange cop (#25923)

2023-07-12 10:03:06 +02:00

encrypted_message.rb

…

export.rb

…

extended_description.rb

…

favourite.rb

…

featured_tag.rb

…

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

…

instance.rb

…

invite_filter.rb

…

invite.rb

…

ip_block.rb

…

list_account.rb

…

list_feed.rb

…

list.rb

…

login_activity.rb

…

marker.rb

…

media_attachment.rb

…

mention.rb

…

message_franking.rb

…

mute.rb

…

notification.rb

Rails 7.0 update (#25668)

2023-07-13 09:36:07 +02:00

one_time_key.rb

…

poll_vote.rb

…

poll.rb

…

preview_card_provider.rb

Fix Style/SlicingWithRange cop (#25923)

2023-07-12 10:03:06 +02:00

preview_card_trend.rb

…

preview_card.rb

…

privacy_policy.rb

…

public_feed.rb

…

relationship_filter.rb

…

relay.rb

…

remote_follow.rb

…

report_filter.rb

…

report_note.rb

…

report.rb

…

rule.rb

…

scheduled_status.rb

…

search.rb

…

session_activation.rb

…

setting.rb

…

site_upload.rb

…

status_edit.rb

…

status_pin.rb

…

status_stat.rb

…

status_trend.rb

…

status.rb

Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream

2023-07-13 22:40:15 +02:00

system_key.rb

…

tag_feed.rb

…

tag_follow.rb

…

tag.rb

…

tombstone.rb

…

translation.rb

…

trends.rb

Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream

2023-07-12 15:38:35 +02:00

unavailable_domain.rb

…

user_invite_request.rb

…

user_ip.rb

…

user_role.rb

…

user_settings.rb

…

user.rb

Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream

2023-07-12 15:38:35 +02:00

web.rb

…

webauthn_credential.rb

…

webhook.rb

…