Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		2019-01-10 21:00:30 +01:00
..
admin	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
form	…
web	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
account_conversation_spec.rb	Add conversations API (#8832)	2018-10-07 23:44:58 +02:00
account_domain_block_spec.rb	…
account_filter_spec.rb	Redesign admin accounts index (#9340)	2018-11-26 15:53:27 +01:00
account_moderation_note_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
account_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
account_stat_spec.rb	Extract counters from accounts table to account_stats table (#9295)	2018-11-19 00:43:52 +01:00
account_tag_stat_spec.rb	Add specs for AccountTagStat model (#9452)	2018-12-07 16:37:56 +01: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_filter_spec.rb	Add specs for CustomEmojiFilter (#9599)	2018-12-21 18:52:57 +01:00
custom_emoji_spec.rb	Make custom emoji domains case insensitive #9351 (#9474)	2018-12-11 05:30:57 +01: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	Show exact number of followers/statuses on export page/in tooltip (#8199)	2018-08-14 21:56:17 +02:00
favourite_spec.rb	…
follow_request_spec.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-04 14:16:30 -05:00
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	Add spec for Identity.find_for_oauth (#9441)	2018-12-06 17:38:49 +09:00
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	Remove pending spec (#9442)	2018-12-06 17:39:15 +09:00
preview_card_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
relay_spec.rb	Add federation relay support (#7998)	2018-07-13 02:16:06 +02:00
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	Add missing tests for report.rb (#7324)	2018-05-03 10:42:36 +02:00
scheduled_status_spec.rb	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
session_activation_spec.rb	…
setting_spec.rb	Isolate each specs for cache store (#6450)	2018-02-17 22:35:05 +01:00
site_upload_spec.rb	…
status_pin_spec.rb	Append '.test' to hostname in stub data (#7260)	2018-04-25 14:12:28 +02:00
status_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
status_stat_spec.rb	Extract counters from accounts table to account_stats table (#9295)	2018-11-19 00:43:52 +01:00
stream_entry_spec.rb	…
subscription_spec.rb	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
tag_spec.rb	…
user_spec.rb	Add REST API for creating an account (#9572)	2018-12-24 19:12:38 +01:00