Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb

2019-09-30 12:23:57 +02:00

..

controllers

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

2019-09-30 12:23:57 +02:00

fabricators

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

2019-09-30 12:23:57 +02:00

features

…

fixtures

…

helpers

…

lib

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

2019-09-30 12:23:57 +02:00

mailers

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00

models

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

2019-09-30 12:23:57 +02:00

policies

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

2019-08-06 13:16:53 +02:00

presenters

…

requests

…

routing

…

serializers/activitypub

…

services

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

2019-09-30 12:23:57 +02:00

support

…

validators

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

2019-08-06 13:16:53 +02:00

views

…

workers

Add domain block notes (#11515)

2019-08-07 20:20:23 +02:00

rails_helper.rb

…

spec_helper.rb

…