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 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		5 years ago
..
admin	…
concerns	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
form	Add site-wide options to show reblogs and replies in local/public timelines	5 years ago
web	Do no retry web push workers if the server returns a 4xx response (#9434)	6 years ago
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_conversation.rb	Fix crash when conversations have no valid participants (#10078)	6 years ago
account_domain_block.rb	Add option to overwrite imported data (#9962)	6 years ago
account_filter.rb	Admission-based registrations mode (#10250)	6 years ago
account_identity_proof.rb	Fix Keybase verification using wrong domain for remote accounts (#10547)	6 years ago
account_moderation_note.rb	…
account_pin.rb	…
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_filter.rb	…
custom_filter.rb	…
domain_block.rb	Provide a link to existing domain block when trying to block an already-blocked domain (#10663)	5 years ago
email_domain_block.rb	…
export.rb	Export and import show_reblogs together with following list (#10495)	6 years ago
favourite.rb	…
featured_tag.rb	Fix featured tag form not failing on failed tag validations (#10167)	6 years ago
feed.rb	Create Redisable#redis (#9633)	6 years ago
follow.rb	…
follow_request.rb	Fix MergeWorker being queued for remote users (#10355)	6 years ago
home_feed.rb	…
identity.rb	…
import.rb	Add option to overwrite imported data (#9962)	6 years ago
instance.rb	Improve performance of list of blocked domains by caching counts (#10374)	6 years ago
instance_filter.rb	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	6 years ago
invite.rb	…
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mention.rb	…
mute.rb	…
notification.rb	Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)	6 years ago
poll.rb	Add support for custom emojis in poll options (#10322)	6 years ago
poll_vote.rb	Add optimistic lock to avoid race conditions when handling votes (#10196)	6 years ago
preview_card.rb	Add WebP support (#9879)	6 years ago
relay.rb	Fix relay enabling/disabling not resetting inbox availability status (#10048)	6 years ago
remote_follow.rb	…
remote_profile.rb	…
report.rb	Set and store report URIs (#10303)	6 years ago
report_filter.rb	…
report_note.rb	…
scheduled_status.rb	Fix deleting a scheduled status immediately deleting media attachments (#9728)	6 years ago
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	Improvements to image upload validation and creation (#10431)	6 years ago
status.rb	Add site-wide options to show reblogs and replies in local/public timelines	5 years ago
status_pin.rb	…
status_stat.rb	…
stream_entry.rb	…
subscription.rb	…
tag.rb	Fix `tagged` param not being normalized before querying tags (#10249)	6 years ago
tombstone.rb	Fix missing account association in tombstone model (#9857)	6 years ago
trending_tags.rb	Create Redisable#redis (#9633)	6 years ago
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
user_invite_request.rb	Add "why do you want to join" field to invite requests (#10524)	6 years ago
web.rb	…