David Yip b6159bcb0a Merge remote-tracking branch 'origin/merge-upstream'

2018-02-10 22:08:45 -06:00

..

controllers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-08 23:17:14 +00:00

fabricators

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

features

…

fixtures

…

helpers

…

lib

…

mailers

Make text e-mails consistent with HTML ones in UserMailer (#6291)

2018-01-20 01:32:05 +01:00

models

Use Html2Text to generate plaintext for keyword mutes. #236.

2018-02-10 10:36:16 -06:00

policies

…

presenters

…

requests

…

routing

…

services

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-08 23:17:14 +00:00

support

…

validators

…

views

…

workers

…

rails_helper.rb

…

spec_helper.rb

…