diff --git a/Gemfile b/Gemfile index 0b57b6c..d7851c3 100644 --- a/Gemfile +++ b/Gemfile @@ -41,9 +41,10 @@ # devise for user authentication gem 'devise', '~> 4.2.0' gem 'devise_invitable', '~> 1.7.0' -gem 'omniauth', '~> 1.3.1' +gem 'omniauth', '~> 1.3.2' gem 'omniauth-shibboleth', '~> 1.2.1' -gem 'omniauth-orcid', '~> 1.2.1' +gem 'omniauth-orcid', '~> 2.0' +gem 'ruby_dig' # for omniauth-orcid #rolify for roles gem 'rolify', '~> 5.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 48e2cc7..8365c2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -138,12 +138,13 @@ globalid (0.3.7) activesupport (>= 4.1.0) hashdiff (0.3.0) - hashie (3.4.6) + hashie (3.5.7) htmltoword (0.5.1) actionpack nokogiri rubyzip (>= 1.0) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) @@ -151,7 +152,7 @@ rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) + json (1.8.6) jwt (1.5.6) kaminari (1.0.1) activesupport (>= 4.1.0) @@ -177,7 +178,7 @@ mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.3.0) - minitest (5.9.1) + minitest (5.11.3) minitest-capybara (0.8.2) capybara (~> 2.2) minitest (~> 5.0) @@ -199,26 +200,26 @@ ruby-progressbar momentjs-rails (2.17.1) railties (>= 3.1) - multi_json (1.12.1) - multi_xml (0.5.5) + multi_json (1.13.1) + multi_xml (0.6.0) multipart-post (2.0.0) mysql2 (0.3.21) - nokogiri (1.8.1) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) normalize-rails (4.1.1) - oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.3.1) + omniauth (1.3.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) - omniauth-orcid (1.2.1) + omniauth-orcid (2.0.2) omniauth-oauth2 (~> 1.3) omniauth-shibboleth (1.2.1) omniauth (>= 1.0.0) @@ -230,7 +231,7 @@ activemodel (>= 4.0.1, < 5.0) pundit (1.1.0) activesupport (>= 3.0.0) - rack (1.6.4) + rack (1.6.9) rack-mini-profiler (0.10.1) rack (>= 1.2.0) rack-test (0.6.3) @@ -248,9 +249,9 @@ sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) @@ -268,6 +269,7 @@ railties (>= 4.2.0, < 5.1) rolify (5.1.0) ruby-progressbar (1.8.1) + ruby_dig (0.0.2) rubyzip (1.2.0) safe_yaml (1.0.4) sass (3.4.22) @@ -304,9 +306,9 @@ eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (0.19.1) - thread_safe (0.3.5) + thread_safe (0.3.6) tilt (2.0.5) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) warden (1.2.6) rack (>= 1.0) @@ -352,8 +354,8 @@ minitest-rails-capybara (~> 2.1.2) minitest-reporters (~> 1.1.11) mysql2 (~> 0.3.18) - omniauth (~> 1.3.1) - omniauth-orcid (~> 1.2.1) + omniauth (~> 1.3.2) + omniauth-orcid (~> 2.0) omniauth-shibboleth (~> 1.2.1) pg (~> 0.19.0) protected_attributes (~> 1.1.3) @@ -366,6 +368,7 @@ redcarpet (>= 3.3.4) responders (~> 2.0) rolify (~> 5.1.0) + ruby_dig simplecov (~> 0.12) sqlite3 (~> 1.3.12) swagger-docs (>= 0.2.9) @@ -382,4 +385,4 @@ ruby 2.2.2p95 BUNDLED WITH - 1.13.2 + 1.13.7