diff --git a/Gemfile b/Gemfile index a6af7d5..af0ab0c 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem 'jbuilder', '~> 2.5' # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', '>= 1.1.0', require: false gem 'clearance' -gem 'rails_admin', '~> 1.3' +gem 'rails_admin', '~> 1.4' gem 'draper' gem 'data_migrate' gem 'font-awesome-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 5d8ee08..de45ac1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,7 +62,7 @@ GEM autoprefixer-rails (>= 9.1.0) popper_js (>= 1.14.3, < 2) sassc-rails (>= 2.0.0) - builder (3.2.3) + builder (3.2.4) byebug (10.0.2) capybara (3.12.0) addressable @@ -90,8 +90,8 @@ GEM coffee-script-source (1.12.2) commonmarker (0.18.2) ruby-enum (~> 0.5) - concurrent-ruby (1.1.3) - crass (1.0.5) + concurrent-ruby (1.1.7) + crass (1.0.6) data_migrate (5.2.0) rails (>= 4.2) development_ribbon (0.2.0) @@ -108,17 +108,17 @@ GEM request_store (~> 1.0) email_validator (1.6.0) activemodel - erubi (1.7.1) + erubi (1.10.0) execjs (2.7.0) ffi (1.9.25) font-awesome-rails (4.7.0.4) railties (>= 3.2, < 6.0) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) - haml (5.0.4) + haml (5.2.1) temple (>= 0.8.0) tilt - i18n (1.1.1) + i18n (1.8.7) concurrent-ruby (~> 1.0) io-like (0.3.0) jaro_winkler (1.5.1) @@ -131,40 +131,41 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - kaminari (1.1.1) + kaminari (1.2.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.1.1) - kaminari-activerecord (= 1.1.1) - kaminari-core (= 1.1.1) - kaminari-actionview (1.1.1) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) actionview - kaminari-core (= 1.1.1) - kaminari-activerecord (1.1.1) + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) activerecord - kaminari-core (= 1.1.1) - kaminari-core (1.1.1) + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.3.1) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - method_source (0.9.2) - mimemagic (0.3.2) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.11.3) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.5.0) + minitest (5.14.3) msgpack (1.2.4) multi_json (1.13.1) nested_form (0.3.2) - nio4r (2.3.1) - nokogiri (1.10.5) - mini_portile2 (~> 2.4.0) + nio4r (2.5.4) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) parallel (1.12.1) parser (2.5.3.0) ast (~> 2.4.0) @@ -175,8 +176,9 @@ GEM puma (3.12.2) pundit (2.0.0) activesupport (>= 3.0.0) - rack (2.0.8) - rack-pjax (1.0.0) + racc (1.5.2) + rack (2.2.3) + rack-pjax (1.1.0) nokogiri (~> 1.5) rack (>= 1.1) rack-test (1.1.0) @@ -197,9 +199,9 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - rails_admin (1.4.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + rails_admin (1.4.3) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) @@ -219,12 +221,12 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.1) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rake (13.0.3) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) regexp_parser (1.3.0) - remotipart (1.4.2) + remotipart (1.4.4) request_store (1.4.1) rack (>= 1.4) rpam2 (4.0.2) @@ -260,7 +262,7 @@ GEM ruby-progressbar (1.10.0) ruby_dep (1.5.0) rubyzip (1.3.0) - sass (3.7.2) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -291,18 +293,18 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - temple (0.8.0) - thor (0.20.3) + temple (0.8.2) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.9) + tilt (2.0.10) turbolinks (5.2.0) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) @@ -312,9 +314,9 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - websocket-driver (0.7.0) + websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) @@ -342,7 +344,7 @@ DEPENDENCIES puma (~> 3.12) pundit rails (~> 5.2.2) - rails_admin (~> 1.3) + rails_admin (~> 1.4) rpam2 rspec-rails rspec-retry