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

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

Improve admin page (#4121)

2017-07-18 16:38:22 +02:00

glitch

Add some examples for Glitch::KeywordMute::TagMatcher. #208.

2017-11-15 23:31:49 -06:00

web

…

account_domain_block_spec.rb

…

account_filter_spec.rb

…

account_moderation_note_spec.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

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

Add tests for CustomEmoji#local? and #object_type (#5621)

2017-11-08 15:28:17 +09:00

domain_block_spec.rb

…

email_domain_block_spec.rb

Add uniqueness to block email domains (#5692)

2017-11-14 20:37:17 +01:00

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

Lists (#5703)

2017-11-18 00:16:48 +01:00

import_spec.rb

…

invite_spec.rb

Add consumable invites (#5814)

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

list_account_spec.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

list_spec.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

media_attachment_spec.rb

Add tests for MediaAttachment (#5620)

2017-11-08 15:29:07 +09:00

mention_spec.rb

…

mute_spec.rb

…

notification_spec.rb

Fix N+1 at notification (#5752)

2017-11-19 15:32:48 +01:00

preview_card_spec.rb

…

remote_follow_spec.rb

Remove empty strings (#5732)

2017-11-17 10:52:30 +09:00

remote_profile_spec.rb

Add tests for RemoteProfile (#5665)

2017-11-12 16:23:31 +09:00

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

Add tests for SessionActivation (#5668)

2017-11-13 09:54:48 +09:00

setting_spec.rb

Fix mistake in cache deletion (#6408)

2018-02-02 10:10:18 +01:00

site_upload_spec.rb

Add a test for SiteUpload#cache_key (#5685)

2017-11-14 20:44:11 +01:00

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

Add tests for StreamEntry (#5687)

2017-11-15 02:00:58 +01:00

subscription_spec.rb

…

tag_spec.rb

Add a test for Tag#to_param (#5705)

2017-11-15 16:04:41 +01:00

user_spec.rb

Fix email confirmation link not updating email (#6187)

2018-01-05 00:15:35 +01:00