Merge branch 'main' into refactor/maintain-pagination-in-associations

avo-hq · Sep 26, 2024 · 5984ccd · 5984ccd
2 parents 60c40eb + b8b5a93
commit 5984ccd
Show file tree

Hide file tree

Showing 18 changed files with 47 additions and 28 deletions.
diff --git a/Gemfile b/Gemfile
@@ -83,9 +83,11 @@ group :development do
 
   gem "actual_db_schema"
 
-  gem "derailed_benchmarks", "~> 2.1"
+  gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2"
 
-  # gem "ruby-statistics", "< 4"
+  # Keep version look on <4 until this PR gets merged and released
+  # https://github.com/zombocom/derailed_benchmarks/pull/239
+  gem "ruby-statistics", "< 4"
 end
 
 group :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -547,7 +547,7 @@ GEM
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    ruby-statistics (4.0.1)
+    ruby-statistics (3.0.2)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
@@ -700,7 +700,7 @@ DEPENDENCIES
   cuprite
   database_cleaner-active_record
   debug
-  derailed_benchmarks (~> 2.1)
+  derailed_benchmarks (~> 2.1, >= 2.1.2)
   devise
   dotenv-rails
   erb-formatter
@@ -739,6 +739,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rubocop
   rubocop-shopify
+  ruby-statistics (< 4)
   rubycritic
   simplecov
   simplecov-cobertura

diff --git a/gemfiles/rails_6.1_ruby_3.1.4.gemfile b/gemfiles/rails_6.1_ruby_3.1.4.gemfile
@@ -59,7 +59,8 @@ group :development do
   gem "rubocop-shopify", require: false
   gem "rubycritic", require: false
   gem "actual_db_schema"
-  gem "derailed_benchmarks", "~> 2.1", group: :development
+  gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2"
+  gem "ruby-statistics", "< 4"
 end
 
 group :test do

diff --git a/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock b/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock
@@ -517,7 +517,7 @@ GEM
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    ruby-statistics (4.0.1)
+    ruby-statistics (3.0.2)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
@@ -666,7 +666,7 @@ DEPENDENCIES
   cuprite
   database_cleaner-active_record
   debug
-  derailed_benchmarks (~> 2.1)
+  derailed_benchmarks (~> 2.1, >= 2.1.2)
   devise
   dotenv-rails
   erb-formatter
@@ -706,6 +706,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rubocop
   rubocop-shopify
+  ruby-statistics (< 4)
   rubycritic
   simplecov
   simplecov-cobertura

diff --git a/gemfiles/rails_6.1_ruby_3.3.0.gemfile b/gemfiles/rails_6.1_ruby_3.3.0.gemfile
@@ -59,7 +59,8 @@ group :development do
   gem "rubocop-shopify", require: false
   gem "rubycritic", require: false
   gem "actual_db_schema"
-  gem "derailed_benchmarks", "~> 2.1", group: :development
+  gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2"
+  gem "ruby-statistics", "< 4"
 end
 
 group :test do

diff --git a/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock b/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock
@@ -490,7 +490,7 @@ GEM
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    ruby-statistics (4.0.1)
+    ruby-statistics (3.0.2)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
@@ -639,7 +639,7 @@ DEPENDENCIES
   cuprite
   database_cleaner-active_record
   debug
-  derailed_benchmarks (~> 2.1)
+  derailed_benchmarks (~> 2.1, >= 2.1.2)
   devise
   dotenv-rails
   erb-formatter
@@ -679,6 +679,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rubocop
   rubocop-shopify
+  ruby-statistics (< 4)
   rubycritic
   simplecov
   simplecov-cobertura

diff --git a/gemfiles/rails_7.1_ruby_3.1.4.gemfile b/gemfiles/rails_7.1_ruby_3.1.4.gemfile
@@ -59,7 +59,8 @@ group :development do
   gem "rubocop-shopify", require: false
   gem "rubycritic", require: false
   gem "actual_db_schema"
-  gem "derailed_benchmarks", "~> 2.1", group: :development
+  gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2"
+  gem "ruby-statistics", "< 4"
 end
 
 group :test do

diff --git a/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock b/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock
@@ -536,7 +536,7 @@ GEM
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    ruby-statistics (4.0.1)
+    ruby-statistics (3.0.2)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
@@ -687,7 +687,7 @@ DEPENDENCIES
   cuprite
   database_cleaner-active_record
   debug
-  derailed_benchmarks (~> 2.1)
+  derailed_benchmarks (~> 2.1, >= 2.1.2)
   devise
   dotenv-rails
   erb-formatter
@@ -727,6 +727,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rubocop
   rubocop-shopify
+  ruby-statistics (< 4)
   rubycritic
   simplecov
   simplecov-cobertura

diff --git a/gemfiles/rails_7.1_ruby_3.3.0.gemfile b/gemfiles/rails_7.1_ruby_3.3.0.gemfile
@@ -59,7 +59,8 @@ group :development do
   gem "rubocop-shopify", require: false
   gem "rubycritic", require: false
   gem "actual_db_schema"
-  gem "derailed_benchmarks", "~> 2.1", group: :development
+  gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2"
+  gem "ruby-statistics", "< 4"
 end
 
 group :test do

diff --git a/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock b/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock
@@ -509,7 +509,7 @@ GEM
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    ruby-statistics (4.0.1)
+    ruby-statistics (3.0.2)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
@@ -660,7 +660,7 @@ DEPENDENCIES
   cuprite
   database_cleaner-active_record
   debug
-  derailed_benchmarks (~> 2.1)
+  derailed_benchmarks (~> 2.1, >= 2.1.2)
   devise
   dotenv-rails
   erb-formatter
@@ -700,6 +700,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rubocop
   rubocop-shopify
+  ruby-statistics (< 4)
   rubycritic
   simplecov
   simplecov-cobertura

diff --git a/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile b/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile
@@ -59,7 +59,8 @@ group :development do
   gem "rubocop-shopify", require: false
   gem "rubycritic", require: false
   gem "actual_db_schema"
-  gem "derailed_benchmarks", "~> 2.1", group: :development
+  gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2"
+  gem "ruby-statistics", "< 4"
 end
 
 group :test do

diff --git a/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile.lock b/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile.lock
@@ -509,7 +509,7 @@ GEM
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    ruby-statistics (4.0.1)
+    ruby-statistics (3.0.2)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
@@ -660,7 +660,7 @@ DEPENDENCIES
   cuprite
   database_cleaner-active_record
   debug
-  derailed_benchmarks (~> 2.1)
+  derailed_benchmarks (~> 2.1, >= 2.1.2)
   devise
   dotenv-rails
   erb-formatter
@@ -700,6 +700,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rubocop
   rubocop-shopify
+  ruby-statistics (< 4)
   rubycritic
   simplecov
   simplecov-cobertura

diff --git a/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile b/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile
@@ -59,7 +59,8 @@ group :development do
   gem "rubocop-shopify", require: false
   gem "rubycritic", require: false
   gem "actual_db_schema"
-  gem "derailed_benchmarks", "~> 2.1", group: :development
+  gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2"
+  gem "ruby-statistics", "< 4"
 end
 
 group :test do

diff --git a/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile.lock b/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile.lock
@@ -509,7 +509,7 @@ GEM
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    ruby-statistics (4.0.1)
+    ruby-statistics (3.0.2)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
@@ -660,7 +660,7 @@ DEPENDENCIES
   cuprite
   database_cleaner-active_record
   debug
-  derailed_benchmarks (~> 2.1)
+  derailed_benchmarks (~> 2.1, >= 2.1.2)
   devise
   dotenv-rails
   erb-formatter
@@ -700,6 +700,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rubocop
   rubocop-shopify
+  ruby-statistics (< 4)
   rubycritic
   simplecov
   simplecov-cobertura

diff --git a/gemfiles/rails_8.0_ruby_3.1.4.gemfile b/gemfiles/rails_8.0_ruby_3.1.4.gemfile
@@ -59,7 +59,8 @@ group :development do
   gem "rubocop-shopify", require: false
   gem "rubycritic", require: false
   gem "actual_db_schema"
-  gem "derailed_benchmarks", "~> 2.1", group: :development
+  gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2"
+  gem "ruby-statistics", "< 4"
 end
 
 group :test do

diff --git a/gemfiles/rails_8.0_ruby_3.1.4.gemfile.lock b/gemfiles/rails_8.0_ruby_3.1.4.gemfile.lock
@@ -516,7 +516,7 @@ GEM
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    ruby-statistics (4.0.1)
+    ruby-statistics (3.0.2)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
@@ -668,7 +668,7 @@ DEPENDENCIES
   cuprite
   database_cleaner-active_record
   debug
-  derailed_benchmarks (~> 2.1)
+  derailed_benchmarks (~> 2.1, >= 2.1.2)
   devise
   dotenv-rails
   erb-formatter
@@ -708,6 +708,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rubocop
   rubocop-shopify
+  ruby-statistics (< 4)
   rubycritic
   simplecov
   simplecov-cobertura

diff --git a/gemfiles/rails_8.0_ruby_3.3.0.gemfile b/gemfiles/rails_8.0_ruby_3.3.0.gemfile
@@ -59,7 +59,8 @@ group :development do
   gem "rubocop-shopify", require: false
   gem "rubycritic", require: false
   gem "actual_db_schema"
-  gem "derailed_benchmarks", "~> 2.1", group: :development
+  gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2"
+  gem "ruby-statistics", "< 4"
 end
 
 group :test do

diff --git a/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock b/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock
@@ -516,7 +516,7 @@ GEM
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    ruby-statistics (4.0.1)
+    ruby-statistics (3.0.2)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
@@ -668,7 +668,7 @@ DEPENDENCIES
   cuprite
   database_cleaner-active_record
   debug
-  derailed_benchmarks (~> 2.1)
+  derailed_benchmarks (~> 2.1, >= 2.1.2)
   devise
   dotenv-rails
   erb-formatter
@@ -708,6 +708,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rubocop
   rubocop-shopify
+  ruby-statistics (< 4)
   rubycritic
   simplecov
   simplecov-cobertura