5 Commits (a1c6e6de1b42ea1ecfa2bb188ab56ee5f73611ce)

Author	SHA1	Message	Date
Thibaut Girka	e87bd6d94a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes	2019-02-01 16:12:20 +01:00
Eugen Rochko	1f95190202	Refactor icons in web UI to use Icon component (#9951) ... * Refactor uses of icons to an Icon component in web UI * Refactor options passed to the Icon component * Make tests work with absolute component paths	2019-02-01 00:14:05 +01:00
kibigo!	fc2c8b50dd	Removed glitch tests	2017-11-17 19:29:17 -08:00
Yamagishi Kazutoshi	402da46ff6	Enable coverage for Jest (#5442)	2017-10-18 11:39:36 +02:00
Yamagishi Kazutoshi	d5b767c374	Replace JavaScript Testing Framework from Mocha to Jest (#5412)	2017-10-16 09:33:08 +02:00