You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
access_token_fabricator.rb	Introduce access token fabricators (#4401)	7 years ago
accessible_access_token_fabricator.rb	Introduce access token fabricators (#4401)	7 years ago
account_domain_block_fabricator.rb	Ensure unique identifiers in fabricated objects in tests (#3173)	8 years ago
account_fabricator.rb	Lint pass (#8876)	6 years ago
account_moderation_note_fabricator.rb	Add moderation note (#5240)	7 years ago
account_pin_fabricator.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	6 years ago
account_stat_fabricator.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
account_tag_stat_fabricator.rb	Add profile directory (#9427)	6 years ago
account_warning_fabricator.rb	Add moderation warnings (#9519)	6 years ago
account_warning_preset_fabricator.rb	Add moderation warnings (#9519)	6 years ago
admin_action_log_fabricator.rb	Add logging of admin actions (#5757)	7 years ago
application_fabricator.rb	Fix tests, add applications to eager loading/cache for statuses, fix	8 years ago
backup_fabricator.rb	Account archive download (#6460)	7 years ago
block_fabricator.rb	add more tests to models	8 years ago
bookmark_fabricator.rb	Add spec for bookmark endpoints	7 years ago
conversation_account_fabricator.rb	Add conversations API (#8832)	6 years ago
conversation_fabricator.rb	Add conversation model, <ostatus:conversation /> (#3016)	8 years ago
conversation_mute_fabricator.rb	Feature conversations muting (#3017)	8 years ago
custom_emoji_fabricator.rb	Custom emoji (#4988)	7 years ago
custom_filter_fabricator.rb	Keyword/phrase filtering (#7905)	7 years ago
domain_block_fabricator.rb	Cover Admin::DomainBlocksController more (#3329)	8 years ago
email_domain_block_fabricator.rb	Implement EmailBlackList (#5109)	7 years ago
favourite_fabricator.rb	Delete records in smaller transaction (#2802)	8 years ago
follow_fabricator.rb	add more tests to models	8 years ago
follow_request_fabricator.rb	Remove redundant code in AtomSerializer and spec (#3528)	8 years ago
identity_fabricator.rb	CAS + SAML authentication feature (#6425)	7 years ago
import_fabricator.rb	Import feature for following/blocking lists (addresses #62, #177, #201, #454)	8 years ago
invite_fabricator.rb	Add consumable invites (#5814)	7 years ago
list_account_fabricator.rb	Lists (#5703)	7 years ago
list_fabricator.rb	Lint pass (#8876)	6 years ago
media_attachment_fabricator.rb	Update fabricator for MediaAttachment to attach a file according to type (#3862)	8 years ago
mention_fabricator.rb	add more tests to models	8 years ago
mute_fabricator.rb	More status specs (#2564)	8 years ago
notification_fabricator.rb	Change columns in notifications nonnullable (#6764)	7 years ago
relay_fabricator.rb	Lint pass (#8876)	6 years ago
report_fabricator.rb	Admin reports controller improvements (#1714)	8 years ago
report_note_fabricator.rb	Add tests for report notes controller (#7589)	7 years ago
scheduled_status_fabricator.rb	Add scheduled statuses (#9706)	6 years ago
session_activation_fabricator.rb	Add tests for SessionActivation (#5668)	7 years ago
setting_fabricator.rb	Add tests for Setting (#5683)	7 years ago
site_upload_fabricator.rb	Lint pass (#8876)	6 years ago
status_fabricator.rb	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	7 years ago
status_pin_fabricator.rb	Pinned statuses (#4675)	7 years ago
status_stat_fabricator.rb	Move status counters to separate table, count replies (#8104)	6 years ago
stream_entry_fabricator.rb	Cover ApplicationController more in spec (#3230)	8 years ago
subscription_fabricator.rb	Spec coverage and refactor for pubsub/delivery worker (#3021)	8 years ago
tag_fabricator.rb	Ensure unique identifiers in fabricated objects in tests (#3173)	8 years ago
user_fabricator.rb	Add REST API for creating an account (#9572)	6 years ago
web_push_subscription_fabricator.rb	Ensure push subscription is immediately removed when application is revoked (#7548)	7 years ago
web_setting_fabricator.rb	Ensure push subscription is immediately removed when application is revoked (#7548)	7 years ago