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 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		5 years ago
..
admin	Fix option to send e-mail notification about account action always being true (#11242)	5 years ago
concerns	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
form	Merge branch 'master' into glitch-soc/merge-upstream	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	5 years ago
account_conversation.rb	…
account_domain_block.rb	…
account_filter.rb	Add moderation API (#9387)	5 years ago
account_identity_proof.rb	…
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)	5 years ago
custom_emoji_category.rb	Add categories for custom emojis (#11196)	5 years ago
custom_emoji_filter.rb	…
custom_filter.rb	Fix expiration date of filters being set to “Never” when editing them (#11204)	5 years ago
direct_feed.rb	Use a redis-cached feed for the DM timeline	5 years ago
domain_block.rb	Change domain blocks to automatically support subdomains (#11138)	5 years ago
email_domain_block.rb	…
export.rb	…
favourite.rb	…
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	Remove expensive counters from federation page in admin UI (#11139)	5 years ago
instance_filter.rb	…
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	Add `account_id` param to `GET /api/v1/notifications` (#10796)	6 years ago
poll.rb	…
poll_vote.rb	…
preview_card.rb	…
relay.rb	…
remote_follow.rb	…
report.rb	Add moderation API (#9387)	5 years ago
report_filter.rb	Add moderation API (#9387)	5 years ago
report_note.rb	Fix scope latest of ReportNote (#9630)	6 years ago
scheduled_status.rb	…
search.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	7 years ago
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	Disallow numeric-only hashtags (#11363)	5 years ago
tombstone.rb	…
trending_tags.rb	…
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
user_invite_request.rb	…
web.rb	…