Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/status.rb

Resolved by taking both changes (not a real conflict, just changes too close
to each other).

2018-11-27 13:23:02 +01:00

..

access_token_fabricator.rb

…

accessible_access_token_fabricator.rb

…

account_domain_block_fabricator.rb

…

account_fabricator.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

account_moderation_note_fabricator.rb

…

account_pin_fabricator.rb

Public profile endorsements (accounts picked by profile owner) (#8146)

2018-08-09 09:56:53 +02:00

account_stat_fabricator.rb

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

admin_action_log_fabricator.rb

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

application_fabricator.rb

…

backup_fabricator.rb

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

block_fabricator.rb

…

bookmark_fabricator.rb

Add spec for bookmark endpoints

2018-04-11 21:05:34 +02:00

conversation_account_fabricator.rb

Add conversations API (#8832)

2018-10-07 23:44:58 +02:00

conversation_fabricator.rb

…

conversation_mute_fabricator.rb

…

custom_emoji_fabricator.rb

…

custom_filter_fabricator.rb

Keyword/phrase filtering (#7905)

2018-06-29 15:34:36 +02:00

domain_block_fabricator.rb

…

email_domain_block_fabricator.rb

…

favourite_fabricator.rb

…

follow_fabricator.rb

…

follow_request_fabricator.rb

…

identity_fabricator.rb

CAS + SAML authentication feature (#6425)

2018-02-04 05:42:13 +01:00

import_fabricator.rb

…

invite_fabricator.rb

Add consumable invites (#5814)

2017-11-27 16:07:59 +01:00

list_account_fabricator.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

list_fabricator.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

media_attachment_fabricator.rb

…

mention_fabricator.rb

…

mute_fabricator.rb

…

notification_fabricator.rb

Change columns in notifications nonnullable (#6764)

2018-03-24 12:51:28 +01:00

relay_fabricator.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

report_fabricator.rb

…

report_note_fabricator.rb

Add tests for report notes controller (#7589)

2018-05-22 14:45:10 +02:00

session_activation_fabricator.rb

…

setting_fabricator.rb

…

site_upload_fabricator.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

status_fabricator.rb

…

status_pin_fabricator.rb

…

status_stat_fabricator.rb

Move status counters to separate table, count replies (#8104)

2018-08-14 19:19:32 +02:00

stream_entry_fabricator.rb

…

subscription_fabricator.rb

…

tag_fabricator.rb

…

user_fabricator.rb

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +02:00

web_push_subscription_fabricator.rb

Ensure push subscription is immediately removed when application is revoked (#7548)

2018-05-19 21:05:08 +02:00

web_setting_fabricator.rb

Ensure push subscription is immediately removed when application is revoked (#7548)

2018-05-19 21:05:08 +02:00