Merge branch 'saml'

This commit is contained in:
jfederico
2018-04-24 18:56:48 +00:00
6 changed files with 66 additions and 1 deletions

View File

@@ -163,6 +163,9 @@ GEM
omniauth-oauth2 (1.5.0)
oauth2 (~> 1.1)
omniauth (~> 1.2)
omniauth-saml (1.8.1)
omniauth (~> 1.3)
ruby-saml (~> 1.4, >= 1.4.3)
omniauth-twitter (1.2.1)
json (~> 1.3)
omniauth-oauth (~> 1.1)
@@ -213,6 +216,8 @@ GEM
ffi (>= 0.5.0, < 2)
request_store (1.4.0)
rack (>= 1.4)
ruby-saml (1.4.3)
nokogiri (>= 1.5.10)
rubyntlm (0.3.4)
sass (3.5.5)
sass-listen (~> 4.0.0)
@@ -302,6 +307,7 @@ DEPENDENCIES
omniauth (= 1.6.1)
omniauth-google-oauth2 (= 0.4.1)
omniauth-ldap
omniauth-saml
omniauth-twitter (= 1.2.1)
paperclip (~> 5.1)
pg