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
..
admin	Add logging of admin actions (#5757)	7 years ago
concerns	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
form	…
web	Add REST API for Web Push Notifications subscriptions (#7445)	6 years ago
account_domain_block_spec.rb	…
account_filter_spec.rb	…
account_moderation_note_spec.rb	Lists (#5703)	7 years ago
account_spec.rb	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
backup_spec.rb	Account archive download (#6460)	6 years ago
block_spec.rb	…
conversation_mute_spec.rb	…
conversation_spec.rb	…
custom_emoji_spec.rb	Change custom emoji search to `ILIKE` instead of `=` (#7099)	6 years ago
custom_filter_spec.rb	Keyword/phrase filtering (#7905)	6 years ago
domain_block_spec.rb	…
email_domain_block_spec.rb	Add uniqueness to block email domains (#5692)	7 years ago
export_spec.rb	…
favourite_spec.rb	…
follow_request_spec.rb	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
follow_spec.rb	…
home_feed_spec.rb	Lists (#5703)	7 years ago
identity_spec.rb	CAS + SAML authentication feature (#6425)	7 years ago
import_spec.rb	…
invite_spec.rb	Add consumable invites (#5814)	7 years ago
list_account_spec.rb	Lists (#5703)	7 years ago
list_spec.rb	Lists (#5703)	7 years ago
media_attachment_spec.rb	Save video metadata and improve video OpenGraph tags (#6481)	6 years ago
mention_spec.rb	…
mute_spec.rb	…
notification_spec.rb	Change columns in notifications nonnullable (#6764)	6 years ago
preview_card_spec.rb	…
relay_spec.rb	Add federation relay support (#7998)	6 years ago
remote_follow_spec.rb	Remove empty strings (#5732)	7 years ago
remote_profile_spec.rb	Add tests for RemoteProfile (#5665)	7 years ago
report_filter_spec.rb	…
report_spec.rb	Add missing tests for report.rb (#7324)	6 years ago
session_activation_spec.rb	Add tests for SessionActivation (#5668)	7 years ago
setting_spec.rb	Isolate each specs for cache store (#6450)	6 years ago
site_upload_spec.rb	Add a test for SiteUpload#cache_key (#5685)	7 years ago
status_pin_spec.rb	Append '.test' to hostname in stub data (#7260)	6 years ago
status_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
stream_entry_spec.rb	Add tests for StreamEntry (#5687)	7 years ago
subscription_spec.rb	…
tag_spec.rb	Add a test for Tag#to_param (#5705)	7 years ago
user_spec.rb	Change language opt-out to language opt-in (#7823)	6 years ago