kibigo! 8d6b9ba494 Merge upstream 2.0ish #165		2017-10-11 10:43:10 -07:00
..
controllers	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
fabricators	Add moderation note (#5240)	2017-10-07 20:26:43 +02:00
features	…
fixtures	Custom emoji (#4988)	2017-09-19 02:42:40 +02:00
helpers	Add moderation note (#5240)	2017-10-07 20:26:43 +02:00
javascript	Update emoji-mart to v2.1.1 (#5256)	2017-10-07 12:17:02 +02:00
lib	Encode custom emojis as resolveable objects in ActivityPub (#5243)	2017-10-07 17:43:42 +02:00
mailers	…
models	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
policies	…
presenters	…
requests	…
routing	…
services	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
support	…
validators	Fix StatusLengthValidator tests	2017-09-02 11:37:40 -05:00
views	fix haml quotes in a bid to make travis less grumpy	2017-10-06 09:07:04 +02:00
workers	Follow-up to #4582 and #5027, removing dead code (#5101)	2017-09-26 01:06:27 +02:00
rails_helper.rb	…
spec_helper.rb	Minor performance improvement for test suite (#4678)	2017-08-24 13:31:55 +02:00