Merge branch 'mainline' into dev

Merge pull request #3755 from Growstuff/dependabot/bundler/faraday-2.9.1
Bump faraday from 2.9.0 to 2.9.1
2026-05-26 09:50:08 -04:00 · 2024-06-07 13:40:03 +09:30 · 2024-06-06 07:43:45 +00:00 · 2024-06-06 07:26:59 +00:00 · 2024-06-05 04:29:58 +00:00 · 2024-06-05 04:13:53 +00:00
5 changed files with 117 additions and 111 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,35 +33,35 @@ GEM
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      actionview (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
      rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.2)
-      actionview (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      nokogiri (>= 1.8.5)
      racc
      rack (>= 2.2.4)
@@ -69,15 +69,15 @@ GEM
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
@@ -92,22 +92,22 @@ GEM
    active_utils (3.4.1)
      activesupport (>= 4.2)
      i18n
-    activejob (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
      globalid (>= 0.3.6)
-    activemodel (7.1.3.2)
-      activesupport (= 7.1.3.2)
-    activerecord (7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      timeout (>= 0.4.0)
-    activestorage (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      marcel (~> 1.0)
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.4)
      base64
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -122,14 +122,14 @@ GEM
    ast (2.4.2)
    autoprefixer-rails (10.4.16.0)
      execjs (~> 2)
-    axe-core-api (4.9.0)
+    axe-core-api (4.9.1)
      dumb_delegator
      virtus
-    axe-core-capybara (4.9.0)
-      axe-core-api
+    axe-core-capybara (4.9.1)
+      axe-core-api (= 4.9.1)
      dumb_delegator
-    axe-core-rspec (4.9.0)
-      axe-core-api
+    axe-core-rspec (4.9.1)
+      axe-core-api (= 4.9.1)
      dumb_delegator
      virtus
    axiom-types (0.1.1)
@@ -137,19 +137,12 @@ GEM
      ice_nine (~> 0.11.0)
      thread_safe (~> 0.3, >= 0.3.1)
    base64 (0.2.0)
-    bcrypt (3.1.19)
+    bcrypt (3.1.20)
    better_errors (2.10.1)
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
      rouge (>= 1.0.0)
-    better_html (2.0.2)
-      actionview (>= 6.0)
-      activesupport (>= 6.0)
-      ast (~> 2.0)
-      erubi (~> 1.4)
-      parser (>= 2.4)
-      smart_properties
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
    bluecloth (2.2.0)
    bonsai-elasticsearch-rails (7.0.1)
      elasticsearch-model (< 8)
@@ -167,7 +160,7 @@ GEM
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
    byebug (11.1.3)
-    cancancan (3.5.0)
+    cancancan (3.6.1)
    capybara (3.40.0)
      addressable
      matrix
@@ -190,7 +183,7 @@ GEM
      image_processing (~> 1.1)
      marcel (~> 1.0.0)
      ssrf_filter (~> 1.0)
-    chartkick (5.0.6)
+    chartkick (5.0.7)
    childprocess (5.0.0)
    codeclimate-test-reporter (1.0.9)
      simplecov (<= 0.13)
@@ -206,9 +199,10 @@ GEM
    coffee-script-source (1.12.2)
    comfy_bootstrap_form (4.0.9)
      rails (>= 5.0.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.1)
    connection_pool (2.4.1)
    crass (1.0.6)
+    csv (3.3.0)
    csv_shaper (1.3.2)
      activesupport (>= 3.0.0)
    dalli (3.2.8)
@@ -221,7 +215,7 @@ GEM
    date (3.3.4)
    descendants_tracker (0.0.4)
      thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.9.3)
+    devise (4.9.4)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0)
@@ -231,9 +225,9 @@ GEM
    discard (1.3.0)
      activerecord (>= 4.2, < 8)
    docile (1.1.5)
-    dotenv (3.1.0)
-    dotenv-rails (3.1.0)
-      dotenv (= 3.1.0)
+    dotenv (3.1.2)
+    dotenv-rails (3.1.2)
+      dotenv (= 3.1.2)
      railties (>= 6.1)
    drb (2.2.1)
    dumb_delegator (1.0.0)
@@ -252,16 +246,16 @@ GEM
      multi_json
    erubi (1.12.0)
    erubis (2.7.0)
-    excon (0.109.0)
+    excon (0.110.0)
    execjs (2.9.1)
    factory_bot (6.4.5)
      activesupport (>= 5.0.0)
    factory_bot_rails (6.4.3)
      factory_bot (~> 6.4)
      railties (>= 5.0.0)
-    faker (3.3.1)
+    faker (3.4.1)
      i18n (>= 1.8.11, < 2)
-    faraday (2.9.0)
+    faraday (2.9.1)
      faraday-net_http (>= 2.0, < 3.2)
    faraday-net_http (3.1.0)
      net-http
@@ -272,7 +266,9 @@ GEM
    friendly_id (5.5.1)
      activerecord (>= 4.0.0)
    gbifrb (0.2.0)
-    geocoder (1.8.2)
+    geocoder (1.8.3)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
    gibbon (1.2.1)
      httparty
      multi_json (>= 1.9.0)
@@ -296,7 +292,7 @@ GEM
      activesupport (>= 5.1)
      haml (>= 4.0.6)
      railties (>= 5.1)
-    haml_lint (0.57.0)
+    haml_lint (0.58.0)
      haml (>= 5.0)
      parallel (~> 1.10)
      rainbow
@@ -309,16 +305,15 @@ GEM
      moneta
      multi_json (>= 1.9.2)
      webrick
-    highline (2.1.0)
+    highline (3.0.1)
    httparty (0.21.0)
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
-    i18n (1.14.4)
+    i18n (1.14.5)
      concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.13)
+    i18n-tasks (1.0.14)
      activesupport (>= 4.0.2)
      ast (>= 2.1.0)
-      better_html (>= 1.0, < 3.0)
      erubi
      highline (>= 2.0.0)
      i18n
@@ -334,8 +329,8 @@ GEM
      mini_magick (>= 4.9.5, < 5)
      ruby-vips (>= 2.0.17, < 3)
    io-console (0.7.2)
-    irb (1.12.0)
-      rdoc
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
    jquery-rails (4.6.0)
      rails-dom-testing (>= 1, < 3)
@@ -389,8 +384,8 @@ GEM
      rake
    mini_magick (4.12.0)
    mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.22.3)
+    mini_portile2 (2.8.7)
+    minitest (5.23.1)
    moneta (1.0.0)
    msgpack (1.7.2)
    multi_json (1.15.0)
@@ -398,20 +393,20 @@ GEM
    mutex_m (0.2.0)
    net-http (0.4.1)
      uri
-    net-imap (0.4.10)
+    net-imap (0.4.11)
      date
      net-protocol
    net-pop (0.1.2)
      net-protocol
    net-protocol (0.2.2)
      timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
      net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.16.3)
+    nio4r (2.7.3)
+    nokogiri (1.16.5)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.16.3-x86_64-linux)
+    nokogiri (1.16.5-x86_64-linux)
      racc (~> 1.4)
    oauth (0.5.6)
    oj (3.16.3)
@@ -430,13 +425,13 @@ GEM
      rack
    orm_adapter (0.5.0)
    parallel (1.24.0)
-    parser (3.3.0.5)
+    parser (3.3.2.0)
      ast (~> 2.4.1)
      racc
    percy-capybara (5.0.0)
      capybara (>= 3)
    pg (1.5.6)
-    platform-api (3.6.0)
+    platform-api (3.7.0)
      heroics (~> 0.1.1)
      moneta (~> 1.0.0)
      rate_throttle_client (~> 0.1.0)
@@ -450,7 +445,7 @@ GEM
    puma (6.4.2)
      nio4r (~> 2.0)
    query_diet (0.7.1)
-    racc (1.7.3)
+    racc (1.8.0)
    rack (2.2.9)
    rack-cors (2.0.2)
      rack (>= 2.0.0)
@@ -464,20 +459,20 @@ GEM
    rackup (1.0.0)
      rack (< 3)
      webrick
-    rails (7.1.3.2)
-      actioncable (= 7.1.3.2)
-      actionmailbox (= 7.1.3.2)
-      actionmailer (= 7.1.3.2)
-      actionpack (= 7.1.3.2)
-      actiontext (= 7.1.3.2)
-      actionview (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      bundler (>= 1.15.0)
-      railties (= 7.1.3.2)
+      railties (= 7.1.3.4)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@@ -489,7 +484,7 @@ GEM
    rails-html-sanitizer (1.6.0)
      loofah (~> 2.21)
      nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 8)
    rails_12factor (0.0.3)
@@ -497,9 +492,9 @@ GEM
      rails_stdout_logging
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      irb
      rackup (>= 1.0.0)
      rake (>= 12.2)
@@ -515,15 +510,16 @@ GEM
    rdoc (6.6.3.1)
      psych (>= 4.0.0)
    recaptcha (5.16.0)
-    redis-client (0.20.0)
+    redis-client (0.22.1)
      connection_pool
-    regexp_parser (2.9.0)
-    reline (0.4.3)
+    regexp_parser (2.9.2)
+    reline (0.5.7)
      io-console (~> 0.5)
    responders (3.1.1)
      actionpack (>= 5.2)
      railties (>= 5.2)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
    rouge (4.1.2)
    rspec (3.13.0)
      rspec-core (~> 3.13.0)
@@ -564,7 +560,7 @@ GEM
    rswag-ui (2.13.0)
      actionpack (>= 3.1, < 7.2)
      railties (>= 3.1, < 7.2)
-    rubocop (1.63.0)
+    rubocop (1.64.1)
      json (~> 2.3)
      language_server-protocol (>= 3.17.0)
      parallel (~> 1.10)
@@ -575,8 +571,8 @@ GEM
      rubocop-ast (>= 1.31.1, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
    rubocop-capybara (2.20.0)
      rubocop (~> 1.41)
    rubocop-factory_bot (2.25.1)
@@ -586,12 +582,12 @@ GEM
      rack (>= 1.1)
      rubocop (>= 1.33.0, < 2.0)
      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.29.1)
+    rubocop-rspec (2.30.0)
      rubocop (~> 1.40)
      rubocop-capybara (~> 2.17)
      rubocop-factory_bot (~> 2.22)
      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.2)
+    rubocop-rspec_rails (2.28.3)
      rubocop (~> 1.40)
    ruby-progressbar (1.13.0)
    ruby-units (4.0.3)
@@ -616,12 +612,12 @@ GEM
    searchkick (5.3.1)
      activemodel (>= 6.1)
      hashie
-    selenium-webdriver (4.19.0)
+    selenium-webdriver (4.20.1)
      base64 (~> 0.2)
      rexml (~> 3.2, >= 3.2.5)
      rubyzip (>= 1.2.2, < 3.0)
      websocket (~> 1.0)
-    sidekiq (7.2.2)
+    sidekiq (7.2.4)
      concurrent-ruby (< 2)
      connection_pool (>= 2.3.0)
      rack (>= 2.2.4)
@@ -631,7 +627,6 @@ GEM
      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
    simplecov-html (0.10.2)
-    smart_properties (1.17.0)
    sprockets (3.7.3)
      base64
      concurrent-ruby (~> 1.0)
@@ -642,6 +637,7 @@ GEM
      sprockets (>= 3.0.0)
    ssrf_filter (1.1.2)
    stringio (3.1.0)
+    strscan (3.1.0)
    sysexits (1.2.0)
    temple (0.10.3)
    terminal-table (3.0.2)
@@ -651,7 +647,7 @@ GEM
    thor (1.3.1)
    thread_safe (0.3.6)
    tilt (2.3.0)
-    timecop (0.9.8)
+    timecop (0.9.9)
    timeout (0.4.1)
    trollop (1.16.2)
    tzinfo (2.0.6)
@@ -688,7 +684,7 @@ GEM
      webrick
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.14)

 PLATFORMS
  ruby
--- a/README.md
+++ b/README.md
@@ -15,6 +15,11 @@ Growstuff was founded in 2012 and has been built by dozens of
 [contributors](CONTRIBUTORS.md).  We are an inclusive, welcoming project, and
 encourage participation from people of all backgrounds and skill levels.

+## Want to contribute?
+
+Don't ask to ask, the best way to get started is to fork the project, start a codespace and get hacking.
+Dive on in and submit your PRs.
+
 ## Important links

 * [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're
--- a/app/views/harvests/index.html.haml
+++ b/app/views/harvests/index.html.haml
@@ -28,6 +28,8 @@
    %section
      %h2= title('harvests', @owner, @crop, @planting)
      = will_paginate @harvests
+      - if @harvests.blank?
+        %p No harvests recorded yet
      .index-cards
        - @harvests.each do |h|
          = render 'harvests/card', harvest: h
--- a/app/views/plantings/index.html.haml
+++ b/app/views/plantings/index.html.haml
@@ -39,6 +39,8 @@
    %section
      %h2= title('plantings', @owner, @crop, @planting)
      = will_paginate @plantings
+      - if @plantings.blank?
+        %p No plantings recorded yet
      .index-cards
        - @plantings.each do |p|
          = render 'plantings/card', planting: p
--- a/app/views/seeds/index.html.haml
+++ b/app/views/seeds/index.html.haml
@@ -35,7 +35,8 @@
    %section
      %h2= title('seeds', @owner, @crop, @planting)
      = will_paginate @seeds
-
+      - if @seeds.blank?
+        %p No seeds recorded yet
      .index-cards
        - @seeds.each do |s|
          = render 'seeds/card', seed: s