Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.

2018-10-30 17:52:08 +01:00

..

confirmations_controller.rb

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

2018-08-01 00:18:13 +02:00

omniauth_callbacks_controller.rb

CAS + SAML authentication feature (#6425)

2018-02-04 05:42:13 +01:00

passwords_controller.rb

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

2018-08-01 00:18:13 +02:00

registrations_controller.rb

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

2018-10-27 18:54:26 +02:00

sessions_controller.rb

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

2018-10-30 17:52:08 +01:00