From e52e44eff25dd932973bacdbe541bdeac343844e Mon Sep 17 00:00:00 2001 From: Georg Gadinger Date: Sat, 18 Apr 2020 23:53:11 +0200 Subject: [PATCH] Gemfile: make bundle audit somewhat happy again --- Gemfile | 2 +- Gemfile.lock | 51 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/Gemfile b/Gemfile index 03cb75d0..70ae8baa 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem 'sdoc', '~> 0.4.1', group: :doc gem 'bcrypt', '~> 3.1.7' -gem 'haml' +gem 'haml', '~> 4.0' gem 'bootstrap-sass', '~> 3.4.0' gem 'bootswatch-rails' gem 'sweetalert-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 1c0a4a54..75f11229 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,10 +116,10 @@ GEM delayed_paperclip (3.0.1) activejob (>= 4.2) paperclip (>= 3.3) - devise (4.6.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) devise-i18n (1.1.2) @@ -129,7 +129,7 @@ GEM unf (>= 0.0.5, < 1.0.0) equalizer (0.0.11) erubis (2.7.0) - excon (0.55.0) + excon (0.73.0) execjs (2.7.0) factory_girl (4.8.0) activesupport (>= 3.0.0) @@ -307,7 +307,7 @@ GEM guard (>= 2.0.0) haml (4.0.7) tilt - hashie (3.5.5) + hashie (4.1.0) hike (1.2.3) http (2.2.1) addressable (~> 2.3) @@ -339,12 +339,21 @@ GEM jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (1.8.6) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + kaminari (1.2.0) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.0) + kaminari-activerecord (= 1.2.0) + kaminari-core (= 1.2.0) + kaminari-actionview (1.2.0) + actionview + kaminari-core (= 1.2.0) + kaminari-activerecord (1.2.0) + activerecord + kaminari-core (= 1.2.0) + kaminari-core (1.2.0) kgio (2.11.0) launchy (2.4.3) addressable (~> 2.3) @@ -354,7 +363,7 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.3) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.11) @@ -382,7 +391,7 @@ GEM net-ssh (4.1.0) newrelic_rpm (4.2.0.334) nio4r (2.5.2) - nokogiri (1.10.2) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (2.0.1) nokogiri (~> 1.8, >= 1.8.4) @@ -391,8 +400,8 @@ GEM shellany (~> 0.0) nprogress-rails (0.2.0.2) oauth (0.5.1) - omniauth (1.6.1) - hashie (>= 3.4.6, < 3.6.0) + omniauth (1.9.1) + hashie (>= 3.4.6) rack (>= 1.6.2, < 3) omniauth-oauth (1.1.0) oauth @@ -424,8 +433,8 @@ GEM public_suffix (2.0.5) puma (4.3.3) nio4r (~> 2.0) - rack (1.6.11) - rack-pjax (1.0.0) + rack (1.6.13) + rack-pjax (1.1.0) nokogiri (~> 1.5) rack (>= 1.1) rack-protection (1.5.5) @@ -457,14 +466,14 @@ GEM rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) - rails_admin (1.1.1) + rails_admin (1.4.3) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) - haml (~> 4.0) + haml (>= 4.0, < 6) jquery-rails (>= 3.0, < 5) - jquery-ui-rails (~> 5.0) - kaminari (~> 0.14) + jquery-ui-rails (>= 5.0, < 7) + kaminari (>= 0.14, < 2.0) nested_form (~> 0.3) rack-pjax (>= 0.7) rails (>= 4.0, < 6) @@ -476,7 +485,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.18.0) - rake (12.3.2) + rake (13.0.1) rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) @@ -488,7 +497,7 @@ GEM rdoc (4.3.0) redcarpet (3.4.0) redis (3.3.3) - remotipart (1.3.1) + remotipart (1.4.4) responders (2.4.1) actionpack (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0) @@ -651,7 +660,7 @@ DEPENDENCIES font-kit-rails foreman guard-brakeman - haml + haml (~> 4.0) httparty i18n-js (= 3.0.0.rc10) jbuilder (~> 2.2.4)