Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x		2018-07-16 14:50:42 +02:00
..
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)	2018-05-02 15:45:24 +02:00
account_moderation_note_fabricator.rb
admin_action_log_fabricator.rb
application_fabricator.rb
backup_fabricator.rb
block_fabricator.rb
bookmark_fabricator.rb	Add spec for bookmark endpoints	2018-04-11 21:05:34 +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
import_fabricator.rb
invite_fabricator.rb
list_account_fabricator.rb
list_fabricator.rb
media_attachment_fabricator.rb
mention_fabricator.rb
mute_fabricator.rb
notification_fabricator.rb
relay_fabricator.rb	Add federation relay support (#7998)	2018-07-13 02:16:06 +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
status_fabricator.rb
status_pin_fabricator.rb
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)	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