Thibaut Girka 5f1bdca4c8 Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream ...

Merge upstream changes right before the public profile redesign.

2018-07-30 14:39:06 +02:00

..

controllers

Migrate glitch-soc keyword mutes to Mastodon's

2018-07-09 19:19:23 +02:00

fabricators

Merge branch 'master' into glitch-soc/merge-upstream

2018-07-16 14:50:42 +02:00

features

…

fixtures

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

helpers

Merge branch 'master' into glitch-soc/merge-upstream

2018-07-16 14:50:42 +02:00

lib

Merge branch 'master' into glitch-soc/merge-upstream

2018-07-16 14:50:42 +02:00

mailers

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

models

Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream

2018-07-30 14:39:06 +02:00

policies

…

presenters

Isolate each specs for cache store (#6450)

2018-02-17 22:35:05 +01:00

requests

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02:00

routing

…

services

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

2018-06-12 13:17:21 +00:00

support

…

validators

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

2018-03-27 10:44:12 -05:00

views

Merge branch 'master' into glitch-soc/tentative-merge

2018-07-09 07:13:59 +02:00

workers

…

rails_helper.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

spec_helper.rb

Disable simplecov on CircleCI (#7416)

2018-05-09 16:59:58 +02:00