me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/controllers/auth
History
Thibaut Girka cde0ac1aa7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
..
confirmations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01: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 2019-04-10 09:16:08 +02:00
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00