From 06331b19194e040a6fcb4582258ce275139d5639 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 03:03:38 +0000 Subject: [PATCH] Bump activeadmin from 1.4.3 to 2.3.1 Bumps [activeadmin](https://github.com/activeadmin/activeadmin) from 1.4.3 to 2.3.1. - [Release notes](https://github.com/activeadmin/activeadmin/releases) - [Changelog](https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md) - [Commits](https://github.com/activeadmin/activeadmin/compare/v1.4.3...v2.3.1) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- Gemfile.lock | 69 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 26 deletions(-) diff --git a/Gemfile b/Gemfile index 1cf7ba826..cc9e62fc3 100644 --- a/Gemfile +++ b/Gemfile @@ -67,7 +67,7 @@ gem 'pundit', '~> 2.0' # Authorization policies gem 'active_admin_filters_visibility', github: 'activeadmin-plugins/active_admin_filters_visibility' gem 'active_admin_scoped_collection_actions', github: 'activeadmin-plugins/active_admin_scoped_collection_actions' gem 'active_admin_theme', '~> 1.0' # activeadmin theme -gem 'activeadmin', '~> 1.4.3', '>= 1.4.3' # Admin interface - we need to require >= 1.4.3, since < v1.4.3 has this regression https://github.com/activeadmin/activeadmin/pull/5611 +gem 'activeadmin', '~> 2.3.1' # Admin interface - we need to require >= 1.4.3, since < v1.4.3 has this regression https://github.com/activeadmin/activeadmin/pull/5611 gem 'blazer', '~> 2.1' # Explore data with SQL gem 'chosen-rails', '~> 1.8' # Needed for autocomplete select input for activeadmin gem 'inherited_resources', '~> 1.10' # activeadmin Rails 5 diff --git a/Gemfile.lock b/Gemfile.lock index 1183a5cc9..27a8373b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,18 +50,18 @@ GEM activemodel (>= 4.1, < 6) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activeadmin (1.4.3) - arbre (>= 1.1.1) - coffee-rails + activeadmin (2.3.1) + arbre (~> 1.2, >= 1.2.1) formtastic (~> 3.1) - formtastic_i18n - inherited_resources (>= 1.9.0) - jquery-rails (>= 4.2.0) - kaminari (>= 0.15) - railties (>= 4.2, < 5.3) - ransack (>= 1.8.7) - sass (~> 3.1) - sprockets (< 4.1) + formtastic_i18n (~> 0.4) + inherited_resources (~> 1.7) + jquery-rails (~> 4.2) + kaminari (~> 1.0, >= 1.0.1) + railties (>= 5.0, < 6.1) + ransack (~> 2.1, >= 2.1.1) + sassc-rails (~> 2.1) + sprockets (>= 3.0, < 4.1) + sprockets-es6 (~> 0.9, >= 0.9.2) activejob (5.2.3) activesupport (= 5.2.3) globalid (>= 0.3.6) @@ -108,7 +108,7 @@ GEM builder (~> 3.2) dry-validation (~> 0.12) httparty (~> 0.13) - arbre (1.1.1) + arbre (1.2.1) activesupport (>= 3.0.0) arel (9.0.0) association_count (1.1.0) @@ -129,6 +129,10 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) banktools-se (3.0.0) bcrypt (3.1.12) benchmark-ips (2.7.2) @@ -163,9 +167,9 @@ GEM codeclimate-test-reporter (1.0.7) simplecov coderay (1.1.2) - coffee-rails (4.2.2) + coffee-rails (5.0.0) coffee-script (>= 2.2.0) - railties (>= 4.0.0) + railties (>= 5.2.0) coffee-script (2.4.1) coffee-script-source execjs @@ -229,7 +233,7 @@ GEM dry-types (~> 0.13.1) email_reply_parser (0.5.9) errbase (0.1.1) - erubi (1.8.0) + erubi (1.9.0) excon (0.62.0) execjs (2.7.0) factory_bot (4.11.1) @@ -243,7 +247,7 @@ GEM multipart-post (>= 1.2, < 3) fast_blank (1.0.0) fast_xs (0.8.0) - ffi (1.9.25) + ffi (1.11.1) fission (0.5.0) CFPropertyList (~> 2.2) fog (2.1.0) @@ -478,7 +482,7 @@ GEM ipaddress (0.8.3) jaro_winkler (1.5.2) jmespath (1.4.0) - jquery-rails (4.3.3) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -533,7 +537,7 @@ GEM mimemagic (0.3.3) mini_mime (1.0.1) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.12.2) msgpack (1.2.10) multi_json (1.13.1) multi_xml (0.6.0) @@ -558,6 +562,8 @@ GEM ast (~> 2.4.0) personnummer (0.1.0) pg (1.1.4) + polyamorous (2.3.0) + activerecord (>= 5.0) public_suffix (3.0.3) puma (3.12.1) pundit (2.0.1) @@ -591,7 +597,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) rails-i18n (5.1.3) i18n (>= 0.7, < 2) @@ -603,15 +609,16 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.2) - ransack (2.1.1) + rake (12.3.3) + ransack (2.3.0) actionpack (>= 5.0) activerecord (>= 5.0) activesupport (>= 5.0) i18n + polyamorous (= 2.3.0) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) rb-readline (0.5.5) rbovirt (0.1.7) nokogiri @@ -679,7 +686,7 @@ GEM safe_yaml (1.0.4) safely_block (0.2.1) errbase - 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) @@ -690,6 +697,14 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sidekiq (5.2.7) connection_pool (~> 2.2, >= 2.2.2) rack (>= 1.5.0) @@ -713,6 +728,10 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) @@ -770,7 +789,7 @@ DEPENDENCIES active_admin_scoped_collection_actions! active_admin_theme (~> 1.0) active_model_serializers (~> 0.10) - activeadmin (~> 1.4.3, >= 1.4.3) + activeadmin (~> 2.3.1) ahoy_matey (~> 1.6) airbrake (~> 9.3) ancestry (~> 3.0)