David Yip f61aa8e0f7 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb		2018-03-27 10:26:47 -05:00
..
admin	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
concerns	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-27 10:26:47 -05:00
form
glitch	Use Html2Text to generate plaintext for keyword mutes. #236.	2018-02-10 10:36:16 -06:00
web
account_domain_block_spec.rb
account_filter_spec.rb
account_moderation_note_spec.rb
account_spec.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
backup_spec.rb	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
block_spec.rb
conversation_mute_spec.rb
conversation_spec.rb
custom_emoji_spec.rb
domain_block_spec.rb
email_domain_block_spec.rb
export_spec.rb
favourite_spec.rb
follow_request_spec.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
follow_spec.rb
home_feed_spec.rb
identity_spec.rb	CAS + SAML authentication feature (#6425)	2018-02-04 05:42:13 +01:00
import_spec.rb
invite_spec.rb	Add consumable invites (#5814)	2017-11-27 16:07:59 +01:00
list_account_spec.rb
list_spec.rb
media_attachment_spec.rb	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
mention_spec.rb
mute_spec.rb
notification_spec.rb	Change columns in notifications nonnullable (#6764)	2018-03-24 12:51:28 +01:00
preview_card_spec.rb
remote_follow_spec.rb
remote_profile_spec.rb
report_filter_spec.rb
report_spec.rb
session_activation_spec.rb
setting_spec.rb	Isolate each specs for cache store (#6450)	2018-02-17 22:35:05 +01:00
site_upload_spec.rb
status_pin_spec.rb
status_spec.rb	Examples for Status.as_public_timeline.	2017-12-14 02:57:59 -06:00
stream_entry_spec.rb
subscription_spec.rb
tag_spec.rb
user_spec.rb	Fix email confirmation link not updating email (#6187)	2018-01-05 00:15:35 +01:00