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 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb		6 years ago
..
admin	Add a spec for Admin::ActionLog (#9775)	6 years ago
concerns	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
form	…
web	…
account_conversation_spec.rb	…
account_domain_block_spec.rb	…
account_filter_spec.rb	…
account_moderation_note_spec.rb	…
account_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_stat_spec.rb	…
account_tag_stat_spec.rb	Add specs for AccountTagStat model (#9452)	6 years ago
backup_spec.rb	…
block_spec.rb	…
conversation_mute_spec.rb	…
conversation_spec.rb	…
custom_emoji_filter_spec.rb	Add specs for CustomEmojiFilter (#9599)	6 years ago
custom_emoji_spec.rb	Make custom emoji domains case insensitive #9351 (#9474)	6 years ago
custom_filter_spec.rb	…
domain_block_spec.rb	…
email_domain_block_spec.rb	…
export_spec.rb	…
favourite_spec.rb	…
featured_tag_spec.rb	Add featured hashtags to profiles (#9755)	6 years ago
follow_request_spec.rb	…
follow_spec.rb	…
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	…
media_attachment_spec.rb	…
mention_spec.rb	…
mute_spec.rb	…
notification_spec.rb	Remove pending spec (#9442)	6 years ago
poll_spec.rb	Add polls (#10111)	6 years ago
poll_vote_spec.rb	Add polls (#10111)	6 years ago
preview_card_spec.rb	…
relay_spec.rb	…
remote_follow_spec.rb	…
remote_profile_spec.rb	…
report_filter_spec.rb	…
report_spec.rb	…
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	…
stream_entry_spec.rb	…
subscription_spec.rb	…
tag_spec.rb	…
user_spec.rb	Add REST API for creating an account (#9572)	6 years ago