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
..
admin	…
concerns	…
form	…
web	…
account_alias_spec.rb	…
account_conversation_spec.rb	…
account_domain_block_spec.rb	Spec AccountDomainBlock (#3816)	8 years ago
account_filter_spec.rb	…
account_migration_spec.rb	…
account_moderation_note_spec.rb	…
account_spec.rb	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	6 years ago
account_stat_spec.rb	…
account_tag_stat_spec.rb	…
backup_spec.rb	…
block_spec.rb	…
conversation_mute_spec.rb	Lint pass (#8876)	6 years ago
conversation_spec.rb	…
custom_emoji_category_spec.rb	…
custom_emoji_filter_spec.rb	…
custom_emoji_spec.rb	Make custom emoji domains case insensitive #9351 (#9474)	6 years ago
custom_filter_spec.rb	…
domain_allow_spec.rb	Add whitelist mode (#11291)	6 years ago
domain_block_spec.rb	Change domain blocks to automatically support subdomains (#11138)	6 years ago
email_domain_block_spec.rb	…
export_spec.rb	…
favourite_spec.rb	…
featured_tag_spec.rb	…
follow_request_spec.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
follow_spec.rb	Limit the number of people that can be followed from one account (#8807)	6 years ago
home_feed_spec.rb	…
identity_spec.rb	Add spec for Identity.find_for_oauth (#9441)	6 years ago
import_spec.rb	…
invite_spec.rb	…
list_account_spec.rb	…
list_spec.rb	…
marker_spec.rb	…
media_attachment_spec.rb	…
mention_spec.rb	…
mute_spec.rb	…
notification_spec.rb	Remove pending spec (#9442)	6 years ago
poll_spec.rb	…
poll_vote_spec.rb	…
preview_card_spec.rb	…
relay_spec.rb	Add federation relay support (#7998)	7 years ago
remote_follow_spec.rb	…
report_filter_spec.rb	…
report_spec.rb	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	6 years ago
scheduled_status_spec.rb	Add scheduled statuses (#9706)	6 years ago
session_activation_spec.rb	…
setting_spec.rb	…
site_upload_spec.rb	…
status_pin_spec.rb	…
status_spec.rb	…
status_stat_spec.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
tag_spec.rb	…
trending_tags_spec.rb	…
user_invite_request_spec.rb	…
user_spec.rb	…