diff --git a/Gemfile b/Gemfile index e3cd099625c..e0d54955ff7 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem "devise", "~> 4.6.0" gem "devise-async", "~> 1.0.0" gem "devise_security_extension", git: "https://github.com/phatworx/devise_security_extension.git" #, "~> 0.10" gem "foundation-rails", "~> 6.4.3.0" -gem "foundation_rails_helper", "~> 2.0.0" +gem "foundation_rails_helper", "~> 4.0.0" gem "globalize", "5.2.0" gem "globalize-accessors", "~> 0.2.1" gem "graphiql-rails", "~> 1.4.1" diff --git a/Gemfile.lock b/Gemfile.lock index 32dec0fa812..f01c760973d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -136,7 +136,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.8) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -193,12 +193,11 @@ GEM railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) sprockets-es6 (>= 0.9.0) - foundation_rails_helper (2.0.0) - actionpack (>= 4.1) - activemodel (>= 4.1) - activesupport (>= 4.1) - railties (>= 4.1) - tzinfo (~> 1.2, >= 1.2.2) + foundation_rails_helper (4.0.0) + actionpack (>= 4.1, < 7.0) + activemodel (>= 4.1, < 7.0) + activesupport (>= 4.1, < 7.0) + railties (>= 4.1, < 7.0) geocoder (1.6.3) globalid (0.4.2) activesupport (>= 4.2.0) @@ -276,7 +275,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - loofah (2.6.0) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -289,10 +288,12 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) - mimemagic (0.3.5) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.1) + mini_portile2 (2.5.1) + minitest (5.14.4) mixlib-cli (1.7.0) mixlib-config (2.2.18) tomlrb @@ -304,8 +305,9 @@ GEM net-ssh (6.1.0) newrelic_rpm (4.1.0.333) nio4r (2.5.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.4) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nori (2.6.0) oauth (0.5.4) oauth2 (1.4.4) @@ -359,6 +361,7 @@ GEM powerpack (0.1.2) public_suffix (4.0.5) puma (3.12.6) + racc (1.5.2) rack (2.2.3) rack-accept (0.4.5) rack (>= 0.4) @@ -502,7 +505,7 @@ GEM tins (~> 1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) tins (1.25.0) @@ -515,7 +518,7 @@ GEM rack (>= 1.3, < 3) rack-accept (~> 0.4) tilt (>= 1.4, < 3) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -583,7 +586,7 @@ DEPENDENCIES factory_bot_rails (~> 4.8.2) faker (~> 1.8.7) foundation-rails (~> 6.4.3.0) - foundation_rails_helper (~> 2.0.0) + foundation_rails_helper (~> 4.0.0) globalize (= 5.2.0) globalize-accessors (~> 0.2.1) graphiql-rails (~> 1.4.1)