Thibaut Girka 3f60b096b5 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.

2020-07-15 15:32:40 +02:00

..

controllers

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

2020-07-15 15:32:40 +02:00

fabricators

Change move handler to carry blocks over (#14144)

2020-07-01 13:51:15 +02:00

features

…

fixtures

…

helpers

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

2020-04-04 21:47:37 +02:00

lib

Add support for “start” and “reversed” attributes to ol element

2020-07-01 01:02:27 +02:00

mailers

Add e-mail-based sign in challenge for users with disabled 2FA (#14013)

2020-06-09 10:23:06 +02:00

models

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

2020-07-01 19:23:14 +02:00

policies

…

presenters

…

requests

…

routing

…

serializers/activitypub

…

services

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

2020-07-07 15:58:45 +02:00

support

…

validators

…

views

…

workers

Change move handler to carry blocks over (#14144)

2020-07-01 13:51:15 +02:00

rails_helper.rb

…

spec_helper.rb

…