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 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		6 years ago
..
access_token_fabricator.rb	…
accessible_access_token_fabricator.rb	…
account_domain_block_fabricator.rb	…
account_fabricator.rb	Speed up test suite by not generating RSA keys in test environment (#7296)	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
admin_action_log_fabricator.rb	Add logging of admin actions (#5757)	7 years ago
application_fabricator.rb	…
backup_fabricator.rb	Account archive download (#6460)	6 years ago
block_fabricator.rb	…
bookmark_fabricator.rb	Add spec for bookmark endpoints	6 years ago
conversation_fabricator.rb	…
conversation_mute_fabricator.rb	…
custom_emoji_fabricator.rb	Custom emoji (#4988)	7 years ago
custom_filter_fabricator.rb	Keyword/phrase filtering (#7905)	6 years ago
domain_block_fabricator.rb	…
email_domain_block_fabricator.rb	Implement EmailBlackList (#5109)	7 years ago
favourite_fabricator.rb	…
follow_fabricator.rb	…
follow_request_fabricator.rb	…
identity_fabricator.rb	CAS + SAML authentication feature (#6425)	6 years ago
import_fabricator.rb	…
invite_fabricator.rb	Add consumable invites (#5814)	7 years ago
list_account_fabricator.rb	Lists (#5703)	7 years ago
list_fabricator.rb	Do not push status to feed if its reblog is already inserted (#6488)	6 years ago
media_attachment_fabricator.rb	…
mention_fabricator.rb	…
mute_fabricator.rb	…
notification_fabricator.rb	Change columns in notifications nonnullable (#6764)	6 years ago
relay_fabricator.rb	Add federation relay support (#7998)	6 years ago
report_fabricator.rb	…
report_note_fabricator.rb	Add tests for report notes controller (#7589)	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	Uploads for admin site settings (#4913)	7 years ago
status_fabricator.rb	…
status_pin_fabricator.rb	…
status_stat_fabricator.rb	Move status counters to separate table, count replies (#8104)	6 years ago
stream_entry_fabricator.rb	…
subscription_fabricator.rb	…
tag_fabricator.rb	…
user_fabricator.rb	…
web_push_subscription_fabricator.rb	Ensure push subscription is immediately removed when application is revoked (#7548)	6 years ago
web_setting_fabricator.rb	Ensure push subscription is immediately removed when application is revoked (#7548)	6 years ago