You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		5 years ago
..
admin	…
concerns	✨ Add an LDAP Mail attribute config (#12053)	5 years ago
form	Merge branch 'master' into glitch-soc/master	5 years ago
web	…
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
account_alias.rb	…
account_conversation.rb	…
account_domain_block.rb	…
account_filter.rb	…
account_identity_proof.rb	…
account_migration.rb	…
account_moderation_note.rb	…
account_pin.rb	…
account_stat.rb	Fix account counters being overwritten by parallel writes (#12045)	5 years ago
account_tag_stat.rb	…
account_warning.rb	…
account_warning_preset.rb	…
admin.rb	Add logging of admin actions (#5757)	7 years ago
application_record.rb	…
backup.rb	Increase max backup size (#12602)	5 years ago
block.rb	Store URIs of follows, follow requests and blocks for ActivityPub (#7160)	7 years ago
bookmark.rb	Add bookmarks (#7107)	5 years ago
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	…
custom_emoji_category.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	…
direct_feed.rb	…
domain_allow.rb	…
domain_block.rb	…
email_domain_block.rb	…
export.rb	…
favourite.rb	…
featured_tag.rb	…
feed.rb	…
follow.rb	…
follow_request.rb	Fix MergeWorker being queued for remote users (#10355)	6 years ago
home_feed.rb	…
identity.rb	…
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	…
invite_filter.rb	…
list.rb	Add database support for list show-reply preferences	6 years ago
list_account.rb	Add abilityto add oneself to lists (#12271)	5 years ago
list_feed.rb	…
marker.rb	…
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mention.rb	…
mute.rb	…
notification.rb	Add follow_request notification type (#12198)	5 years ago
poll.rb	Only normalize local polls (#12515)	5 years ago
poll_vote.rb	…
preview_card.rb	…
relay.rb	…
remote_follow.rb	…
report.rb	…
report_filter.rb	Add ability to filter reports by target account domain (#12154)	5 years ago
report_note.rb	…
scheduled_status.rb	…
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	…
status.rb	Add bookmarks (#7107)	5 years ago
status_pin.rb	…
status_stat.rb	Reset status cache when status_stat or media_attachment updates (#9119)	6 years ago
tag.rb	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	5 years ago
tag_filter.rb	…
tombstone.rb	…
trending_tags.rb	…
user.rb	Do not consider moved accounts as non-functional	5 years ago
user_invite_request.rb	…
web.rb	Add extended about page stub	8 years ago