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 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		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	Speed up test suite by not generating RSA keys in test environment (#7296)	7 years ago
account_moderation_note_fabricator.rb	Add moderation note (#5240)	7 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)	7 years ago
block_fabricator.rb	…
bookmark_fabricator.rb	Add spec for bookmark endpoints	7 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)	6 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	…
follow_fabricator.rb	…
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	…
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)	7 years ago
media_attachment_fabricator.rb	Update fabricator for MediaAttachment to attach a file according to type (#3862)	8 years ago
mention_fabricator.rb	…
mute_fabricator.rb	…
notification_fabricator.rb	Change columns in notifications nonnullable (#6764)	7 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)	7 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	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
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	Ensure unique identifiers in fabricated objects in tests (#3173)	8 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