David Yip 95c270f5b1 Merge remote-tracking branch 'origin/master' into gs-master

2017-11-28 11:45:13 -06: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

2017-11-28 11:45:13 -06:00

form

…

glitch

…

web

…

account_domain_block_spec.rb

…

account_filter_spec.rb

…

account_moderation_note_spec.rb

…

account_spec.rb

…

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

Allow hiding of reblogs from followed users (#5762)

2017-11-28 15:00:35 +01:00

follow_spec.rb

…

home_feed_spec.rb

…

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

…

mention_spec.rb

…

mute_spec.rb

…

notification_spec.rb

…

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

…

site_upload_spec.rb

…

status_pin_spec.rb

…

status_spec.rb

…

stream_entry_spec.rb

…

subscription_spec.rb

…

tag_spec.rb

…

user_spec.rb

Add consumable invites (#5814)

2017-11-27 16:07:59 +01:00