diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-29 10:37:27 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-29 10:37:27 +0000 |
| commit | 70b29c3576f646371c3a5bee312b921a3053fb70 (patch) | |
| tree | a0d7ccb7dbe8cec32de964d15e4ede1f14bea809 /app/controllers | |
| parent | aa97325deae515f45c047df3640d7b1f07247038 (diff) | |
| parent | 22de5443c5c37772e090268ed115b88d12427cc4 (diff) | |
| download | gitlab-ce-70b29c3576f646371c3a5bee312b921a3053fb70.tar.gz | |
Merge branch 'feature/saml_support' into 'master'
Add SAML support via Omniauth
Split of !669, with doc
See merge request !722
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 3 |
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 |