From fe7f13066f868e5aabcd6a6714a507e05cff326c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Jan 2021 19:25:40 +0000 Subject: [PATCH] Bump rails_admin from 1.2.0 to 1.4.3 Bumps [rails_admin](https://github.com/sferik/rails_admin) from 1.2.0 to 1.4.3. - [Release notes](https://github.com/sferik/rails_admin/releases) - [Changelog](https://github.com/sferik/rails_admin/blob/v1.4.3/CHANGELOG.md) - [Commits](https://github.com/sferik/rails_admin/compare/v1.2.0...v1.4.3) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 105 +++++++++++++++++++++++++++------------------------ 2 files changed, 56 insertions(+), 51 deletions(-) mode change 100755 => 100644 Gemfile mode change 100755 => 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index bf3c8ad..779d9b6 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ end gem 'devise' gem 'jquery-rails' gem 'materialize-sass' - gem 'rails_admin', '~> 1.2' + gem 'rails_admin', '~> 1.4' gem 'cancancan' gem "paperclip" gem 'rails_admin_rollincode', '~> 1.0' diff --git a/Gemfile.lock b/Gemfile.lock old mode 100755 new mode 100644 index cda6a14..40760db --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GEM arel (8.0.0) bcrypt (3.1.11) bindex (0.5.0) - builder (3.2.3) + builder (3.2.4) byebug (9.0.6) cancancan (2.0.0) capybara (2.15.1) @@ -67,24 +67,26 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.7) + crass (1.0.6) devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.2) responders warden (~> 1.2.3) - erubi (1.6.1) + erubi (1.10.0) execjs (2.7.0) - ffi (1.9.18) - font-awesome-rails (4.7.0.2) - railties (>= 3.2, < 5.2) - globalid (0.4.0) + ffi (1.14.2) + font-awesome-rails (4.7.0.6) + railties (>= 3.2, < 6.2) + globalid (0.4.2) activesupport (>= 4.2.0) - haml (5.0.2) + haml (5.2.1) temple (>= 0.8.0) tilt - i18n (0.8.6) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (2.7.0) activesupport (>= 4.2.0) multi_json (>= 1.2) @@ -92,44 +94,46 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) - kaminari (1.0.1) + kaminari (1.2.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.0.1) - kaminari-activerecord (= 1.0.1) - kaminari-core (= 1.0.1) - kaminari-actionview (1.0.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.0.1) - kaminari-activerecord (1.0.1) + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) kgio (2.11.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.0.3) + loofah (2.8.0) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.1) + mini_mime (>= 0.1.1) materialize-sass (0.98.2) sass (~> 3.3) - method_source (0.8.2) - mime-types (3.1) + method_source (1.0.0) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2020.1104) mimemagic (0.3.2) mini_mime (0.1.4) - mini_portile2 (2.2.0) - minitest (5.10.3) + mini_portile2 (2.5.0) + minitest (5.14.3) multi_json (1.12.1) nested_form (0.3.2) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nio4r (2.5.4) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) orm_adapter (0.5.0) paperclip (5.1.0) activemodel (>= 4.2.0) @@ -140,8 +144,9 @@ GEM pg (0.21.0) public_suffix (2.0.5) puma (3.10.0) - rack (2.0.3) - 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 (0.6.3) @@ -161,15 +166,15 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - rails_admin (1.2.0) + 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) haml (>= 4.0, < 6) jquery-rails (>= 3.0, < 5) - jquery-ui-rails (~> 5.0) + jquery-ui-rails (>= 5.0, < 7) kaminari (>= 0.14, < 2.0) nested_form (~> 0.3) rack-pjax (>= 0.7) @@ -185,17 +190,17 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.19.0) - rake (12.0.0) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - remotipart (1.3.1) + rake (13.0.3) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + remotipart (1.4.4) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) ruby_dep (1.5.0) rubyzip (1.2.1) - sass (3.5.1) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -214,22 +219,22 @@ GEM spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - temple (0.8.0) - thor (0.20.0) + temple (0.8.2) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.10) turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.3) - tzinfo (1.2.3) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) @@ -245,7 +250,7 @@ GEM railties (>= 5.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.5) wicked_pdf (1.1.0) wkhtmltopdf-binary (0.12.3.1) xpath (2.1.0) @@ -269,7 +274,7 @@ DEPENDENCIES pg puma (~> 3.7) rails (~> 5.1.3) - rails_admin (~> 1.2) + rails_admin (~> 1.4) rails_admin_rollincode (~> 1.0) sass-rails (~> 5.0) selenium-webdriver