Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
admin	Add a spec for Admin::ActionLog (#9775)	2019-01-11 07:28:09 +00:00
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
form	…
web	…
account_conversation_spec.rb	…
account_domain_block_spec.rb	…
account_filter_spec.rb	…
account_moderation_note_spec.rb	…
account_spec.rb	…
account_stat_spec.rb	…
account_tag_stat_spec.rb	Add specs for AccountTagStat model (#9452)	2018-12-07 16:37:56 +01:00
backup_spec.rb	…
block_spec.rb	…
conversation_mute_spec.rb	…
conversation_spec.rb	…
custom_emoji_filter_spec.rb	Add specs for CustomEmojiFilter (#9599)	2018-12-21 18:52:57 +01:00
custom_emoji_spec.rb	Make custom emoji domains case insensitive #9351 (#9474)	2018-12-11 05:30:57 +01:00
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)	2019-02-04 04:25:59 +01:00
follow_request_spec.rb	…
follow_spec.rb	…
home_feed_spec.rb	…
identity_spec.rb	Add spec for Identity.find_for_oauth (#9441)	2018-12-06 17:38:49 +09:00
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)	2018-12-06 17:39:15 +09:00
poll_spec.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
poll_vote_spec.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
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)	2019-01-05 12:43:28 +01:00
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)	2018-12-24 19:12:38 +01:00