summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAlex Lossent <alexandre.lossent@cern.ch>2015-05-27 16:37:22 +0200
committerAlex Lossent <alexandre.lossent@cern.ch>2015-05-27 16:38:10 +0200
commit22de5443c5c37772e090268ed115b88d12427cc4 (patch)
tree8a580bca41b4c71b3d4329b103dc1219dfb23feb /app
parent4146ce559e8858604ec91d663eac15f9e5379ff0 (diff)
downloadgitlab-ce-22de5443c5c37772e090268ed115b88d12427cc4.tar.gz
Add SAML support via Omniauth
Diffstat (limited to 'app')
-rw-r--r--app/controllers/omniauth_callbacks_controller.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index dcd949a71de..a767815b311 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -1,4 +1,7 @@
class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+
+ protect_from_forgery except: [:kerberos, :saml]
+
Gitlab.config.omniauth.providers.each do |provider|
define_method provider['name'] do
handle_omniauth