diff --git a/Gemfile b/Gemfile index f2bc0a8..b7cf78c 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'collectiveaccess' # authentication -gem 'devise', '~> 4.2' +gem 'devise', '~> 4.7' # user roles gem "rolify" diff --git a/Gemfile.lock b/Gemfile.lock index 7959459..2552689 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,7 @@ GEM execjs av (0.9.0) cocaine (~> 0.5.3) - bcrypt (3.1.11) + bcrypt (3.1.13) bootstrap-editable-rails (0.0.9) railties (>= 3.1) sass-rails @@ -62,7 +62,7 @@ GEM bootstrap-tour-rails (0.4.0) bootstrap3-datetimepicker-rails (4.17.47) momentjs-rails (>= 2.8.1) - builder (3.2.3) + builder (3.2.4) climate_control (0.2.0) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) @@ -75,14 +75,12 @@ GEM coffee-script-source (1.12.2) collectiveaccess (0.2.3) httparty (~> 0.13) - concurrent-ruby (1.0.5) - crass (1.0.3) - deprecation (1.0.0) - activesupport - devise (4.4.1) + concurrent-ruby (1.1.6) + crass (1.0.6) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.2) + railties (>= 4.1.0) responders warden (~> 1.2.3) dotenv (2.2.1) @@ -119,7 +117,7 @@ GEM htmlentities (4.3.4) httparty (0.15.6) multi_xml (>= 0.5.2) - i18n (0.9.3) + i18n (0.9.5) concurrent-ruby (~> 1.0) immigrant (0.3.6) activerecord (>= 3.0) @@ -142,7 +140,7 @@ GEM rails (>= 4.2.0) ledermann-rails-settings (2.4.2) activerecord (>= 3.1) - loofah (2.1.1) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -152,8 +150,8 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_mime (1.0.0) - mini_portile2 (2.3.0) - minitest (5.11.1) + mini_portile2 (2.4.0) + minitest (5.14.0) momentjs-rails (2.17.1) railties (>= 3.1) multi_json (1.13.1) @@ -161,8 +159,8 @@ GEM multipart-post (2.0.0) mysql2 (0.3.21) net-ldap (0.16.1) - nokogiri (1.8.1) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) @@ -205,7 +203,7 @@ GEM public_suffix (3.0.1) pundit (1.1.0) activesupport (>= 3.0.0) - rack (1.6.8) + rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) rails (4.2.6) @@ -225,8 +223,8 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails4-autocomplete (1.1.1) rails (>= 3.0) railties (4.2.6) @@ -234,7 +232,7 @@ GEM activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.0) + rake (13.0.1) ratyrate (1.2.2.alpha) rb-fsevent (0.10.2) rb-inotify (0.9.10) @@ -244,12 +242,11 @@ GEM json request_store (1.4.0) rack (>= 1.4) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) - riiif (1.7.0) - deprecation (>= 1.0.0) - railties (>= 4.2, < 6) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) + riiif (0.4.1) + rails (> 3.2.0) rolify (5.2.0) roo (2.5.1) nokogiri (~> 1) @@ -287,11 +284,11 @@ GEM therubyrhino (2.0.4) therubyrhino_jar (>= 1.7.3) therubyrhino_jar (1.7.6) - thor (0.20.0) + thor (1.0.1) thread_safe (0.3.6) tilt (2.0.8) truncate_html (0.9.3) - tzinfo (1.2.4) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.1.4) execjs (>= 0.3.0, < 3) @@ -313,7 +310,7 @@ DEPENDENCIES bootstrap3-datetimepicker-rails (~> 4.17.47) coffee-rails (~> 4.1.0) collectiveaccess - devise (~> 4.2) + devise (~> 4.7) dotenv-rails dragonfly (~> 1.0.12) elasticsearch-model @@ -345,7 +342,7 @@ DEPENDENCIES rails4-autocomplete ratyrate recaptcha - riiif + riiif (= 0.4.1) rolify roo (~> 2.5.0) sass-rails