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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		5 years ago
..
assets	Improvements to image upload validation and creation (#10431)	6 years ago
access_token_fabricator.rb	…
accessible_access_token_fabricator.rb	…
account_alias_fabricator.rb	Add account migration UI (#11846)	5 years ago
account_domain_block_fabricator.rb	…
account_fabricator.rb	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	5 years ago
account_identity_proof_fabricator.rb	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	5 years ago
account_migration_fabricator.rb	Add account migration UI (#11846)	5 years ago
account_moderation_note_fabricator.rb	…
account_pin_fabricator.rb	…
account_stat_fabricator.rb	…
account_tag_stat_fabricator.rb	…
account_warning_fabricator.rb	…
account_warning_preset_fabricator.rb	…
admin_action_log_fabricator.rb	…
application_fabricator.rb	…
backup_fabricator.rb	…
block_fabricator.rb	…
bookmark_fabricator.rb	…
conversation_account_fabricator.rb	…
conversation_fabricator.rb	…
conversation_mute_fabricator.rb	…
custom_emoji_category_fabricator.rb	Add categories for custom emojis (#11196)	6 years ago
custom_emoji_fabricator.rb	…
custom_filter_fabricator.rb	…
domain_allow_fabricator.rb	Add whitelist mode (#11291)	5 years ago
domain_block_fabricator.rb	…
email_domain_block_fabricator.rb	…
favourite_fabricator.rb	…
featured_tag_fabricator.rb	…
follow_fabricator.rb	…
follow_request_fabricator.rb	…
identity_fabricator.rb	…
import_fabricator.rb	…
invite_fabricator.rb	…
list_account_fabricator.rb	…
list_fabricator.rb	…
marker_fabricator.rb	Add timeline read markers API (#11762)	5 years ago
media_attachment_fabricator.rb	…
mention_fabricator.rb	…
mute_fabricator.rb	…
notification_fabricator.rb	…
poll_fabricator.rb	…
poll_vote_fabricator.rb	…
relay_fabricator.rb	…
report_fabricator.rb	…
report_note_fabricator.rb	…
scheduled_status_fabricator.rb	…
session_activation_fabricator.rb	…
setting_fabricator.rb	…
site_upload_fabricator.rb	Improvements to image upload validation and creation (#10431)	6 years ago
status_fabricator.rb	…
status_pin_fabricator.rb	…
status_stat_fabricator.rb	…
tag_fabricator.rb	…
user_fabricator.rb	…
user_invite_request_fabricator.rb	Add "why do you want to join" field to invite requests (#10524)	6 years ago
web_push_subscription_fabricator.rb	…
web_setting_fabricator.rb	…