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 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one		5 years ago
..
admin	…
concerns	…
form	…
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	Add moderation warnings (#9519)	6 years ago
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	Fix crash when saving invalid domain name (#11528)	5 years ago
domain_block.rb	…
email_domain_block.rb	…
export.rb	…
favourite.rb	Fix records not being indexed sometimes (#12024)	5 years ago
featured_tag.rb	…
feed.rb	…
follow.rb	…
follow_request.rb	…
home_feed.rb	…
identity.rb	…
import.rb	Add option to overwrite imported data (#9962)	6 years ago
instance.rb	…
instance_filter.rb	…
invite.rb	…
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	Lists (#5703)	7 years ago
marker.rb	…
media_attachment.rb	…
mention.rb	…
mute.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
notification.rb	…
poll.rb	…
poll_vote.rb	…
preview_card.rb	…
relay.rb	…
remote_follow.rb	…
report.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
report_filter.rb	…
report_note.rb	…
scheduled_status.rb	…
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	…
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
status_pin.rb	…
status_stat.rb	…
tag.rb	…
tag_filter.rb	…
tombstone.rb	…
trending_tags.rb	…
user.rb	…
user_invite_request.rb	…
web.rb	…