You cannot 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 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		7 years ago
..
admin	Fix option to send e-mail notification about account action always being true (#11242)	7 years ago
concerns	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
form	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
web	…
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
account_conversation.rb	Fix crash when conversations have no valid participants (#10078)	7 years ago
account_domain_block.rb	Add option to overwrite imported data (#9962)	7 years ago
account_filter.rb	Add moderation API (#9387)	7 years ago
account_identity_proof.rb	Fix Keybase verification using wrong domain for remote accounts (#10547)	7 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	Add categories for custom emojis (#11196)	7 years ago
custom_emoji_category.rb	Add categories for custom emojis (#11196)	7 years ago
custom_emoji_filter.rb	…
custom_filter.rb	Fix expiration date of filters being set to “Never” when editing them (#11204)	7 years ago
direct_feed.rb	Use a redis-cached feed for the DM timeline	7 years ago
domain_block.rb	Change domain blocks to automatically support subdomains (#11138)	7 years ago
email_domain_block.rb	…
export.rb	Export and import show_reblogs together with following list (#10495)	7 years ago
favourite.rb	…
featured_tag.rb	Fix featured tag form not failing on failed tag validations (#10167)	7 years ago
feed.rb	Create Redisable#redis (#9633)	7 years ago
follow.rb	…
follow_request.rb	Fix MergeWorker being queued for remote users (#10355)	7 years ago
home_feed.rb	…
identity.rb	…
import.rb	Add option to overwrite imported data (#9962)	7 years ago
instance.rb	Remove expensive counters from federation page in admin UI (#11139)	7 years ago
instance_filter.rb	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	7 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	7 years ago
mention.rb	…
mute.rb	…
notification.rb	Add `account_id` param to `GET /api/v1/notifications` (#10796)	7 years ago
poll.rb	Add support for custom emojis in poll options (#10322)	7 years ago
poll_vote.rb	Add optimistic lock to avoid race conditions when handling votes (#10196)	7 years ago
preview_card.rb	Add WebP support (#9879)	7 years ago
relay.rb	Fix relay enabling/disabling not resetting inbox availability status (#10048)	7 years ago
remote_follow.rb	…
report.rb	Add moderation API (#9387)	7 years ago
report_filter.rb	Add moderation API (#9387)	7 years ago
report_note.rb	…
scheduled_status.rb	Fix deleting a scheduled status immediately deleting media attachments (#9728)	7 years ago
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	Improvements to image upload validation and creation (#10431)	7 years ago
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
status_pin.rb	…
status_stat.rb	…
subscription.rb	…
tag.rb	Fix only one middle dot being recognized in hashtags (#11345)	7 years ago
tombstone.rb	Record deleted(by mod) status to prevent re-appear (#10732)	7 years ago
trending_tags.rb	Create Redisable#redis (#9633)	7 years ago
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
user_invite_request.rb	Add "why do you want to join" field to invite requests (#10524)	7 years ago
web.rb	…