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

…

concerns

Merge remote-tracking branch 'origin/master' into gs-master

2018-03-27 10:26:47 -05:00

form

…

glitch

…

web

…

account_domain_block_spec.rb

…

account_filter_spec.rb

…

account_moderation_note_spec.rb

…

account_spec.rb

…

backup_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

…

follow_spec.rb

…

home_feed_spec.rb

…

identity_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

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

…

site_upload_spec.rb

…

status_pin_spec.rb

…

status_spec.rb

…

stream_entry_spec.rb

…

subscription_spec.rb

…

tag_spec.rb

…

user_spec.rb

…