aboutsummaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorIN COMMON Collective <collective@incommon.cc>2021-04-09 12:29:16 +0200
committerIN COMMON Collective <collective@incommon.cc>2021-04-09 12:29:16 +0200
commit90c67665394bdd36e86e484020cfbd5ad4f188b2 (patch)
treeb41e2db43f72c92db88c4bc5069a5323c3488021 /app/controllers/application_controller.rb
parentd14700c51d692335f001a93c2f6b13b135783206 (diff)
parent4375650ea0788ae6b2a390b10ca6679d67dfc7a3 (diff)
downloadincommon-map-main.tar.gz
Merge branch 'sso-login' into mainHEADmain
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1eff1a9..25700af 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -4,6 +4,7 @@
class ApplicationController < ActionController::Base
require 'sso'
+ SSO::FromDiscourse.config = Rails.configuration.sso
before_action :current_user