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

Custom emoji (#4988)

2017-09-19 02:42:40 +02:00

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

Redesign the landing page, mount public timeline on it (#4122)

2017-07-11 15:27:59 +02:00

routing

…

services

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

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

support

Some minor change and spec for Account (#3813)

2017-06-22 18:34:27 +02:00

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

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