Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		2018-10-05 15:23:57 +02:00
..
admin	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
form	…
web	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
account_domain_block_spec.rb	…
account_filter_spec.rb	Change admin accounts default sort to most recent (#8813)	2018-10-04 16:05:38 +02:00
account_moderation_note_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
account_pin_spec.rb	…
account_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
backup_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
block_spec.rb	…
conversation_mute_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
conversation_spec.rb	…
custom_emoji_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
custom_filter_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
domain_block_spec.rb	…
email_domain_block_spec.rb	…
export_spec.rb	…
favourite_spec.rb	…
follow_request_spec.rb	…
follow_spec.rb	Limit the number of people that can be followed from one account (#8807)	2018-10-04 17:36:11 +02:00
home_feed_spec.rb	…
identity_spec.rb	…
import_spec.rb	…
invite_spec.rb	…
list_account_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
list_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
media_attachment_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
mention_spec.rb	…
mute_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
notification_spec.rb	…
preview_card_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
relay_spec.rb	…
remote_follow_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-22 20:56:32 +02:00
status_stat_spec.rb	…
stream_entry_spec.rb	…
subscription_spec.rb	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
tag_spec.rb	…
user_spec.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00