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

Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.

2018-12-09 16:08:04 +01:00

..

access_token_fabricator.rb

Introduce access token fabricators (#4401)

2017-07-27 15:16:07 +02:00

accessible_access_token_fabricator.rb

Introduce access token fabricators (#4401)

2017-07-27 15:16:07 +02:00

account_domain_block_fabricator.rb

Ensure unique identifiers in fabricated objects in tests (#3173)

2017-05-20 17:09:40 +02:00

account_fabricator.rb

Lint pass (#8876)

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

account_moderation_note_fabricator.rb

Add moderation note (#5240)

2017-10-07 20:26:43 +02:00

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

account_tag_stat_fabricator.rb

Add profile directory (#9427)

2018-12-06 17:36:11 +01:00

admin_action_log_fabricator.rb

Add logging of admin actions (#5757)

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

application_fabricator.rb

Fix tests, add applications to eager loading/cache for statuses, fix

2017-01-15 14:01:33 +01:00

backup_fabricator.rb

Account archive download (#6460)

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

block_fabricator.rb

add more tests to models

2017-04-05 00:29:56 +02:00

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

Add conversation model, <ostatus:conversation /> (#3016)

2017-05-12 19:09:21 +02:00

conversation_mute_fabricator.rb

Feature conversations muting (#3017)

2017-05-15 03:04:13 +02:00

custom_emoji_fabricator.rb

Custom emoji (#4988)

2017-09-19 02:42:40 +02:00

custom_filter_fabricator.rb

Keyword/phrase filtering (#7905)

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

domain_block_fabricator.rb

Cover Admin::DomainBlocksController more (#3329)

2017-06-25 21:42:36 +02:00

email_domain_block_fabricator.rb

Implement EmailBlackList (#5109)

2017-10-04 15:16:10 +02:00

favourite_fabricator.rb

Delete records in smaller transaction (#2802)

2017-05-04 23:44:39 +02:00

follow_fabricator.rb

add more tests to models

2017-04-05 00:29:56 +02:00

follow_request_fabricator.rb

Remove redundant code in AtomSerializer and spec (#3528)

2017-06-03 20:51:08 +02:00

identity_fabricator.rb

CAS + SAML authentication feature (#6425)

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

import_fabricator.rb

Import feature for following/blocking lists (addresses #62, #177, #201, #454)

2017-03-30 19:42:33 +02:00

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

Update fabricator for MediaAttachment to attach a file according to type (#3862)

2017-06-20 20:40:45 +02:00

mention_fabricator.rb

add more tests to models

2017-04-05 00:29:56 +02:00

mute_fabricator.rb

More status specs (#2564)

2017-04-28 15:10:41 +02:00

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

Admin reports controller improvements (#1714)

2017-04-14 11:10:28 +02:00

report_note_fabricator.rb

Add tests for report notes controller (#7589)

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

session_activation_fabricator.rb

Add tests for SessionActivation (#5668)

2017-11-13 09:54:48 +09:00

setting_fabricator.rb

Add tests for Setting (#5683)

2017-11-14 11:08:04 +09:00

site_upload_fabricator.rb

Lint pass (#8876)

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

status_fabricator.rb

Switch to static URIs, new URI format in both protocols for new statuses (#4815)

2017-09-06 19:01:28 +02:00

status_pin_fabricator.rb

Pinned statuses (#4675)

2017-08-25 01:41:18 +02:00

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

Cover ApplicationController more in spec (#3230)

2017-05-22 17:58:57 +02:00

subscription_fabricator.rb

Spec coverage and refactor for pubsub/delivery worker (#3021)

2017-05-12 20:35:36 +02:00

tag_fabricator.rb

Ensure unique identifiers in fabricated objects in tests (#3173)

2017-05-20 17:09:40 +02:00

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