David Yip 4c1fd9a19c Merge remote-tracking branch 'tootsuite/master' into merge-upstream ...

Conflicts:
      app/javascript/styles/mastodon/components.scss

2018-02-02 08:39:52 -06:00

..

admin

…

concerns

…

form

…

glitch

…

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

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

…

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

…

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

Fix mistake in cache deletion (#6408)

2018-02-02 10:10:18 +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