From b10d5be9c3096a6bb33f75c6ef764ed67bbec51b Mon Sep 17 00:00:00 2001 From: Nate Hopkins Date: Wed, 9 Oct 2019 08:18:49 -0600 Subject: [PATCH] Update pagy and apply a small performance optimization (#657) --- Gemfile | 2 +- Gemfile.lock | 53 ++++++++++++++++++------------------- config/initializers/pagy.rb | 2 +- yarn.lock | 6 ++--- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/Gemfile b/Gemfile index bfd7a5353..673bc839f 100644 --- a/Gemfile +++ b/Gemfile @@ -47,7 +47,7 @@ gem "oj", "~> 3.9.0" gem "okcomputer", "~> 1.17.3" gem "omniauth-github", "~> 1.3.0" gem "omniauth-rails_csrf_protection", "~> 0.1.2" -gem "pagy", "~> 3.5.0" +gem "pagy", "~> 3.6.0" gem "paper_trail", "~> 10.3.0" gem "perm", "~> 1.0.2" gem "pg", ">= 0.18", "< 2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 2f6865411..c342252b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,9 +87,9 @@ GEM awesome_nested_set (>= 3.0) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - airbrake (9.4.4) - airbrake-ruby (~> 4.6) - airbrake-ruby (4.6.0) + airbrake (9.4.5) + airbrake-ruby (~> 4.7) + airbrake-ruby (4.7.0) rbtree3 (~> 0.5) annotate (3.0.2) activerecord (>= 3.2, < 7.0) @@ -100,8 +100,8 @@ GEM activerecord (>= 4.0.0, < 7.0) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.220.0) - aws-sdk-core (3.68.0) + aws-partitions (1.221.0) + aws-sdk-core (3.68.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) aws-sigv4 (~> 1.1) @@ -139,8 +139,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.5) xpath (~> 3.2) - childprocess (2.0.0) - rake (< 13.0) + childprocess (3.0.0) choice (0.2.0) chronic (0.10.2) chunky_png (1.3.11) @@ -191,7 +190,7 @@ GEM execjs (2.7.0) faker (2.5.0) i18n (~> 1.6.0) - faraday (0.16.2) + faraday (0.17.0) multipart-post (>= 1.2, < 3) faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) @@ -272,7 +271,7 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.12.2) - minitest-reporters (1.3.8) + minitest-reporters (1.4.0) ansi builder minitest (>= 5.0) @@ -298,7 +297,7 @@ GEM net-http-digest_auth (1.4.1) net-http-persistent (3.1.0) connection_pool (~> 2.2) - netaddr (2.0.3) + netaddr (2.0.4) netrc (0.11.0) ngrok-tunnel (2.1.1) nio4r (2.5.2) @@ -326,12 +325,12 @@ GEM actionpack (>= 4.2) omniauth (>= 1.3.1) orm_adapter (0.5.0) - pagy (3.5.1) + pagy (3.6.0) paper_trail (10.3.1) activerecord (>= 4.2) request_store (~> 1.1) - parallel (1.17.0) - parser (2.6.4.1) + parallel (1.18.0) + parser (2.6.5.0) ast (~> 2.4.0) pastel (0.7.3) equatable (~> 0.6) @@ -359,7 +358,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.1) - puma (4.2.0) + puma (4.2.1) nio4r (~> 2.0) rack (2.0.7) rack-attack (6.1.0) @@ -395,8 +394,8 @@ GEM activesupport (>= 4.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging @@ -449,7 +448,7 @@ GEM ruby_dep (1.5.0) ruby_identicon (0.0.5) chunky_png (~> 1.3.5) - rubyzip (1.3.0) + rubyzip (2.0.0) runcom (5.1.0) refinements (~> 6.0) xdg (~> 3.1) @@ -464,10 +463,10 @@ GEM sprockets (> 3.0) sprockets-rails tilt - scout_apm (2.6.1) + scout_apm (2.6.2) parser - selenium-webdriver (3.142.5) - childprocess (>= 0.5, < 3.0) + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) sidekiq (6.0.1) connection_pool (>= 2.2.2) @@ -477,7 +476,7 @@ GEM sidekiq-failures (1.0.0) sidekiq (>= 4.0.0) simple-random (1.0.3) - simple_form (5.0.0) + simple_form (5.0.1) actionpack (>= 5.0) activemodel (>= 5.0) simplecov (0.17.1) @@ -516,7 +515,7 @@ GEM sinatra (>= 1.2.6) spreadsheet (1.2.4) ruby-ole (>= 1.0) - sprockets (3.7.2) + sprockets (4.0.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -545,7 +544,7 @@ GEM refinements (~> 6.0) runcom (~> 5.0) thor (~> 0.20) - tty-box (0.4.1) + tty-box (0.5.0) pastel (~> 0.7.2) strings (~> 0.1.6) tty-cursor (~> 0.7) @@ -572,9 +571,9 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webdrivers (4.1.2) + webdrivers (4.1.3) nokogiri (~> 1.6) - rubyzip (~> 1.0) + rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) webmock (3.7.6) addressable (>= 2.3.6) @@ -593,7 +592,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.1) yard (0.9.20) - zeitwerk (2.1.10) + zeitwerk (2.2.0) PLATFORMS ruby @@ -655,7 +654,7 @@ DEPENDENCIES okcomputer (~> 1.17.3) omniauth-github (~> 1.3.0) omniauth-rails_csrf_protection (~> 0.1.2) - pagy (~> 3.5.0) + pagy (~> 3.6.0) paper_trail (~> 10.3.0) perm (~> 1.0.2) pg (>= 0.18, < 2.0) diff --git a/config/initializers/pagy.rb b/config/initializers/pagy.rb index bb557f35c..8fe358fc4 100644 --- a/config/initializers/pagy.rb +++ b/config/initializers/pagy.rb @@ -74,7 +74,7 @@ # Instance variables # See https://ddnexus.github.io/pagy/api/pagy#instance-variables # Pagy::VARS[:items] = 20 # default -Pagy::VARS[:items] = 25 +Pagy::VARS[:items] = 20 # Other Variables # See https://ddnexus.github.io/pagy/api/pagy#other-variables diff --git a/yarn.lock b/yarn.lock index 38d3f049d..1ef20f5fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8,9 +8,9 @@ integrity sha512-GcgwTx/wqoLvdTwgabwSH4GUgyGx5Flbjp0rfnPBN6yaXQ7h2uTeyYEZ2X59AW4ZQnUMxc2Ld93pcOfaF36gcA== "@amcharts/amcharts4@^4.1.3": - version "4.6.5" - resolved "https://registry.yarnpkg.com/@amcharts/amcharts4/-/amcharts4-4.6.5.tgz#5fffa5296d9336a61cd2a5e2bd41a5ae1f37b1b0" - integrity sha512-PyBC9gunHiKuHe/mgRq6GgISbxxKCb0vsJt4iMhibYCRMt1Nh0uxbdYj9tafzVLcZNINjE5gF/ziN274qu/RdA== + version "4.6.9" + resolved "https://registry.yarnpkg.com/@amcharts/amcharts4/-/amcharts4-4.6.9.tgz#285ee5b91f948c91bde85540ddd59549163cba8f" + integrity sha512-bJO6XaCOVA+yer04KVAkOFUnMzbxKiCwcB7VnFSts/cvIDCuDsm3PWKEPjhZRIvoY9AyOG0qFvTsjlfNLQgpkQ== dependencies: "@types/regression" "^2.0.0" canvg "^2.0.0"