David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master

2017-10-16 01:29:02 -05:00

..

concerns

minor code style fixes oops

2017-09-13 21:47:30 -05:00

form

…

web

…

account_domain_block_spec.rb

…

account_filter_spec.rb

…

account_moderation_note_spec.rb

Add moderation note (#5240)

2017-10-07 20:26:43 +02:00

account_spec.rb

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

block_spec.rb

…

conversation_mute_spec.rb

…

conversation_spec.rb

…

custom_emoji_spec.rb

Custom emoji (#4988)

2017-09-19 02:42:40 +02:00

domain_block_spec.rb

…

email_domain_block_spec.rb

Implement EmailBlackList (#5109)

2017-10-04 15:16:10 +02:00

export_spec.rb

…

favourite_spec.rb

…

feed_spec.rb

Improve spec of Feed and UserTrackingConcern (#5367)

2017-10-13 11:00:11 +02:00

follow_request_spec.rb

…

follow_spec.rb

…

import_spec.rb

…

media_attachment_spec.rb

Increase attachment descriptions to 420 characters (#5139)

2017-09-29 02:30:00 +02:00

mention_spec.rb

…

mute_spec.rb

…

notification_spec.rb

…

preview_card_spec.rb

…

report_filter_spec.rb

…

report_spec.rb

Feat add validation for report comment: characters under 1000 valid (#4833)

2017-09-07 09:55:42 +02:00

session_activation_spec.rb

…

site_upload_spec.rb

Uploads for admin site settings (#4913)

2017-09-14 00:04:30 +02:00

status_pin_spec.rb

…

status_spec.rb

Do not filter statuses with unknown languages (#5045)

2017-09-22 19:33:17 +02:00

stream_entry_spec.rb

…

subscription_spec.rb

…

tag_spec.rb

…

user_spec.rb

…