Skip to content
Snippets Groups Projects
Commit 5fd7297f authored by Johannes Frenzel's avatar Johannes Frenzel
Browse files

Merge branch 'feature/484_update_omniauth_saml_2' into 'develop'

Updated Omniauth saml

Closes FDM/rdm-system/antleaf-projectmanagement#484

See merge request !390
parents ca32e523 bc308a0c
No related branches found
No related tags found
1 merge request!390Updated Omniauth saml
Pipeline #20993 passed
...@@ -96,7 +96,7 @@ gem 'aws-sdk-s3', '~> 1' ...@@ -96,7 +96,7 @@ gem 'aws-sdk-s3', '~> 1'
gem 'omniauth' gem 'omniauth'
gem "omniauth-rails_csrf_protection" gem "omniauth-rails_csrf_protection"
gem 'omniauth-orcid' gem 'omniauth-orcid'
gem 'omniauth-saml', '~> 2.1' gem 'omniauth-saml', '~> 2.1.3'
gem "blacklight_range_limit" gem "blacklight_range_limit"
gem 'http-cookie' gem 'http-cookie'
......
...@@ -628,7 +628,7 @@ GEM ...@@ -628,7 +628,7 @@ GEM
noid-rails (3.0.3) noid-rails (3.0.3)
actionpack (>= 5.0.0, < 7) actionpack (>= 5.0.0, < 7)
noid (~> 0.9) noid (~> 0.9)
nokogiri (1.13.1) nokogiri (1.13.10)
mini_portile2 (~> 2.7.0) mini_portile2 (~> 2.7.0)
racc (~> 1.4) racc (~> 1.4)
oai (1.1.0) oai (1.1.0)
...@@ -660,9 +660,9 @@ GEM ...@@ -660,9 +660,9 @@ GEM
omniauth-rails_csrf_protection (1.0.1) omniauth-rails_csrf_protection (1.0.1)
actionpack (>= 4.2) actionpack (>= 4.2)
omniauth (~> 2.0) omniauth (~> 2.0)
omniauth-saml (2.1.0) omniauth-saml (2.1.3)
omniauth (~> 2.0) omniauth (~> 2.1)
ruby-saml (~> 1.12) ruby-saml (~> 1.18)
openseadragon (0.6.0) openseadragon (0.6.0)
rails (> 3.2.0) rails (> 3.2.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
...@@ -836,8 +836,8 @@ GEM ...@@ -836,8 +836,8 @@ GEM
multipart-post multipart-post
oauth2 oauth2
ruby-progressbar (1.11.0) ruby-progressbar (1.11.0)
ruby-saml (1.14.0) ruby-saml (1.18.0)
nokogiri (>= 1.10.5) nokogiri (>= 1.13.10)
rexml rexml
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
ruby_dep (1.5.0) ruby_dep (1.5.0)
...@@ -1038,10 +1038,11 @@ DEPENDENCIES ...@@ -1038,10 +1038,11 @@ DEPENDENCIES
jbuilder (~> 2.5) jbuilder (~> 2.5)
jquery-rails jquery-rails
listen (>= 3.0.5, < 3.2) listen (>= 3.0.5, < 3.2)
nokogiri (= 1.13.10)
omniauth omniauth
omniauth-orcid omniauth-orcid
omniauth-rails_csrf_protection omniauth-rails_csrf_protection
omniauth-saml (~> 2.1) omniauth-saml (~> 2.1.3)
pg pg
puma (~> 3.11) puma (~> 3.11)
rails (~> 5.2.6) rails (~> 5.2.6)
...@@ -1069,4 +1070,4 @@ RUBY VERSION ...@@ -1069,4 +1070,4 @@ RUBY VERSION
ruby 2.7.8p225 ruby 2.7.8p225
BUNDLED WITH BUNDLED WITH
2.1.4 2.1.4
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment