Ondřej Hruška 83bda6c1a8 Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream		2017-09-28 09:18:35 +02:00
..
controllers	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	2017-09-28 09:18:35 +02:00
fabricators	Custom emoji (#4988)	2017-09-19 02:42:40 +02:00
features
fixtures	Custom emoji (#4988)	2017-09-19 02:42:40 +02:00
helpers	Add emoji autosuggest (#5053)	2017-09-23 14:47:32 +02:00
javascript	Fix emojify() by generating a mapping to existing Twemoji files (#5080)	2017-09-25 18:36:33 +02:00
lib	Add missing validations in ActivityPub::Activity::Create (#5096)	2017-09-25 18:33:11 +02:00
mailers
models	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	2017-09-28 09:18:35 +02:00
policies
presenters
requests	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
routing
services	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	2017-09-28 09:18:35 +02:00
support
validators	Fix StatusLengthValidator tests	2017-09-02 11:37:40 -05:00
views	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	2017-09-28 09:12:17 +02:00
workers	Follow-up to #4582 and #5027, removing dead code (#5101)	2017-09-26 01:06:27 +02:00
rails_helper.rb	Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)	2017-07-07 23:25:15 +02:00
spec_helper.rb	Minor performance improvement for test suite (#4678)	2017-08-24 13:31:55 +02:00