Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml

2019-04-01 21:28:31 +02:00

..

controllers

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

2019-04-01 21:28:31 +02:00

fabricators

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

2019-04-01 21:28:31 +02:00

features

…

fixtures

Fix undefined method error in sidekiq (#9807)

2019-01-14 17:28:41 +01:00

helpers

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

2019-03-16 14:14:20 +01:00

lib

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

2019-03-28 13:01:33 +01:00

mailers

Improve e-mail digest (#9689)

2019-01-02 10:47:32 +01:00

models

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

2019-03-13 15:16:02 +01:00

policies

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

2019-01-10 21:00:30 +01:00

presenters

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

2019-03-14 17:17:20 +01:00

requests

Redesign landing page (#10232)

2019-03-12 17:34:00 +01:00

routing

…

serializers/activitypub

Improved remote thread fetching (#10106)

2019-02-28 15:22:21 +01:00

services

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

2019-04-01 21:28:31 +02:00

support

…

validators

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

2019-02-12 20:32:48 +01:00

views

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

2019-03-13 15:16:02 +01:00

workers

Improved remote thread fetching (#10106)

2019-02-28 15:22:21 +01:00

rails_helper.rb

Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)

2019-01-15 23:11:46 +01:00

spec_helper.rb

…