Ondřej Hruška 8b9ee5f16b Merge remote-tracking branch 'upstream/master' into upstream-merge-again

2017-10-16 21:13:47 +02:00

..

controllers

Merge remote-tracking branch 'origin/master' into gs-master

2017-10-16 01:29:02 -05:00

fabricators

Add moderation note (#5240)

2017-10-07 20:26:43 +02:00

features

…

fixtures

…

helpers

Add moderation note (#5240)

2017-10-07 20:26:43 +02:00

lib

Keep references to all reblogs of a status on home feed (#5419)

2017-10-16 20:44:31 +02:00

mailers

…

models

Merge remote-tracking branch 'origin/master' into gs-master

2017-10-16 01:29:02 -05:00

policies

…

presenters

…

requests

…

routing

…

services

Merge remote-tracking branch 'origin/master' into gs-master

2017-10-16 01:29:02 -05:00

support

…

validators

…

views

…

workers

…

rails_helper.rb

…

spec_helper.rb

…