Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly.		2025-01-10 20:41:36 +01:00
..
account	…
account_suggestions	…
admin	…
annual_report	…
concerns	…
form	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01:00
terms_of_service	…
trends	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01:00
user_settings	…
web	…
account.rb	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01:00
account_alias.rb	…
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_relationship_severance_event.rb	…
account_stat.rb	…
account_statuses_cleanup_policy.rb	…
account_suggestions.rb	…
account_summary.rb	…
account_warning.rb	…
account_warning_preset.rb	…
admin.rb	…
announcement.rb	…
announcement_filter.rb	…
announcement_mute.rb	…
announcement_reaction.rb	…
appeal.rb	…
application_record.rb	…
backup.rb	…
block.rb	…
bookmark.rb	…
bulk_import.rb	…
bulk_import_row.rb	…
canonical_email_block.rb	…
content_retention_policy.rb	…
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	…
custom_emoji_category.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	…
custom_filter_keyword.rb	…
custom_filter_status.rb	…
direct_feed.rb	…
domain_allow.rb	…
domain_block.rb	…
email_domain_block.rb	…
export.rb	…
extended_description.rb	…
favourite.rb	…
featured_tag.rb	…
feed.rb	…
follow.rb	…
follow_recommendation.rb	…
follow_recommendation_filter.rb	…
follow_recommendation_mute.rb	…
follow_recommendation_suppression.rb	…
follow_request.rb	…
generated_annual_report.rb	…
home_feed.rb	…
identity.rb	…
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	…
invite_filter.rb	…
ip_block.rb	…
link_feed.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
login_activity.rb	…
marker.rb	…
media_attachment.rb	…
mention.rb	…
mute.rb	…
notification.rb	…
notification_group.rb	…
notification_permission.rb	…
notification_policy.rb	…
notification_request.rb	…
poll.rb	…
poll_vote.rb	…
preview_card.rb	…
preview_card_provider.rb	…
preview_card_trend.rb	…
preview_cards_status.rb	…
privacy_policy.rb	…
public_feed.rb	…
relationship_filter.rb	…
relationship_severance_event.rb	…
relay.rb	…
remote_follow.rb	…
report.rb	…
report_filter.rb	…
report_note.rb	…
rule.rb	…
scheduled_status.rb	…
search.rb	…
session_activation.rb	…
setting.rb	…
severed_relationship.rb	…
site_upload.rb	…
software_update.rb	…
status.rb	…
status_edit.rb	…
status_pin.rb	…
status_stat.rb	…
status_trend.rb	…
tag.rb	…
tag_feed.rb	…
tag_follow.rb	…
tag_trend.rb	…
terms_of_service.rb	…
tombstone.rb	…
translation.rb	…
trends.rb	…
unavailable_domain.rb	…
user.rb	…
user_invite_request.rb	…
user_ip.rb	…
user_role.rb	…
user_settings.rb	…
web.rb	…
webauthn_credential.rb	…
webhook.rb	…