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		2019-12-19 13:52:54 +01:00
..
admin
concerns	✨ Add an LDAP Mail attribute config (#12053)	2019-12-01 18:52:21 +01:00
form
web	Validate Web::PushSubscription (#11971)	2019-09-27 15:24:13 +02:00
account.rb
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	Add API endpoint to list featured accounts (fixes #8315) (#8317)	2018-08-20 18:46:04 +02:00
account_stat.rb
account_tag_stat.rb
account_warning.rb
account_warning_preset.rb
admin.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
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	Fix crash when saving invalid domain name (#11528)	2019-08-08 23:04:19 +02:00
export.rb
favourite.rb
featured_tag.rb
feed.rb
follow.rb
follow_request.rb
home_feed.rb
identity.rb
import.rb
instance.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
instance_filter.rb
invite.rb
invite_filter.rb
list.rb
list_account.rb
list_feed.rb
marker.rb
media_attachment.rb
mention.rb
mute.rb
notification.rb
poll.rb
poll_vote.rb
preview_card.rb
relay.rb
remote_follow.rb
report.rb
report_filter.rb
report_note.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb
status_pin.rb
status_stat.rb
tag.rb
tag_filter.rb
tombstone.rb
trending_tags.rb
user.rb
user_invite_request.rb
web.rb