Merge pull request #3276 from Growstuff/issues/3247-links

Fix #3247 broken links
Merge branch 'dev' into issues/3247-links
2026-05-25 17:31:18 -04:00 · 2023-03-13 13:50:20 +10:30 · 2023-03-13 13:49:45 +10:30 · 2023-03-13 13:48:25 +10:30 · 2023-03-13 13:28:01 +10:30 · 2023-03-13 13:27:53 +10:30
34 changed files with 303 additions and 391 deletions
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.2
+3.1.3
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -92,6 +92,7 @@ submit the change with your pull request.
 - André Aubin / [lambda2](https://github.com/lambda2)
 - Martina Simicic / [simicic](https://github.com/simicic)
 - Rowan Crawford / [wombleton](https://github.com/wombleton)
+- Ítalo Pires / [italopires](https://github.com/italopires)

 ## Bots

--- a/1
+++ b/1
@@ -94,7 +94,6 @@ gem "bootstrap_form", ">= 4.5.0"

 # For connecting to other services (eg Twitter)
 gem 'omniauth', '~> 1.3'
-gem 'omniauth-facebook'
 gem 'omniauth-flickr', '>= 0.0.15'
 gem 'omniauth-twitter'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
  remote: https://github.com/restarone/comfortable-mexican-sofa.git
-  revision: 456fb8507e9668128529c0302fa2e77e029c1f88
+  revision: ccf9415ae220453a199759b8ecbb8e9436c75c85
  specs:
    comfortable_mexican_sofa (2.0.19)
      active_link_to (>= 1.0.0)
@@ -26,47 +26,47 @@ GEM
  remote: https://rubygems.org/
  specs:
    abstract_type (0.0.7)
-    actioncable (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    actioncable (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailbox (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activestorage (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.0.4)
-      actionpack (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailer (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      actionview (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
      rails-dom-testing (~> 2.0)
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionpack (7.0.4.2)
+      actionview (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
      rack (~> 2.0, >= 2.2.0)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4)
-      actionpack (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actiontext (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activestorage (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
+    actionview (7.0.4.2)
+      activesupport (= 7.0.4.2)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
@@ -78,25 +78,25 @@ GEM
      activerecord (>= 4.2)
    active_record_union (1.3.0)
      activerecord (>= 4.0)
-    active_utils (3.3.19)
+    active_utils (3.4.0)
      activesupport (>= 4.2)
      i18n
-    activejob (7.0.4)
-      activesupport (= 7.0.4)
+    activejob (7.0.4.2)
+      activesupport (= 7.0.4.2)
      globalid (>= 0.3.6)
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
-    activestorage (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activesupport (= 7.0.4)
+    activemodel (7.0.4.2)
+      activesupport (= 7.0.4.2)
+    activerecord (7.0.4.2)
+      activemodel (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
+    activestorage (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
      marcel (~> 1.0)
      mini_mime (>= 1.1.0)
-    activesupport (7.0.4)
+    activesupport (7.0.4.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@@ -113,7 +113,7 @@ GEM
    ast (2.4.2)
    autoprefixer-rails (10.4.7.0)
      execjs (~> 2)
-    bcrypt (3.1.17)
+    bcrypt (3.1.18)
    better_errors (2.9.1)
      coderay (>= 1.0.0)
      erubi (>= 1.0.0)
@@ -139,11 +139,11 @@ GEM
      actionpack (>= 5.2)
      activemodel (>= 5.2)
    builder (3.2.4)
-    bullet (7.0.4)
+    bullet (7.0.7)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
    byebug (11.1.3)
-    cancancan (3.4.0)
+    cancancan (3.5.0)
    capybara (3.38.0)
      addressable
      matrix
@@ -167,7 +167,7 @@ GEM
      mimemagic (>= 0.3.0)
      mini_mime (>= 0.1.3)
      ssrf_filter (~> 1.0)
-    chartkick (4.2.1)
+    chartkick (5.0.1)
    codeclimate-test-reporter (1.0.9)
      simplecov (<= 0.13)
    coderay (1.1.3)
@@ -183,19 +183,20 @@ GEM
    concord (0.1.6)
      adamantium (~> 0.2.0)
      equalizer (~> 0.0.9)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
    connection_pool (2.3.0)
    crass (1.0.6)
    csv_shaper (1.3.2)
      activesupport (>= 3.0.0)
-    dalli (3.2.3)
+    dalli (3.2.4)
    database_cleaner (2.0.1)
      database_cleaner-active_record (~> 2.0.0)
    database_cleaner-active_record (2.0.0)
      activerecord (>= 5.a)
      database_cleaner-core (~> 2.0.0)
    database_cleaner-core (2.0.1)
-    devise (4.8.1)
+    date (3.3.3)
+    devise (4.9.0)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0)
@@ -223,7 +224,7 @@ GEM
      faraday (~> 1)
      multi_json
    equalizer (0.0.11)
-    erubi (1.11.0)
+    erubi (1.12.0)
    erubis (2.7.0)
    excon (0.93.1)
    execjs (2.8.1)
@@ -232,9 +233,9 @@ GEM
    factory_bot_rails (6.2.0)
      factory_bot (~> 6.2.0)
      railties (>= 5.0.0)
-    faker (3.0.0)
+    faker (3.1.1)
      i18n (>= 1.8.11, < 2)
-    faraday (1.10.2)
+    faraday (1.10.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@@ -269,7 +270,7 @@ GEM
    gibbon (1.2.1)
      httparty
      multi_json (>= 1.9.0)
-    globalid (1.0.0)
+    globalid (1.1.0)
      activesupport (>= 5.0)
    gravatar-ultimate (2.0.0)
      activesupport (>= 2.3.14)
@@ -288,7 +289,7 @@ GEM
      activesupport (>= 5.1)
      haml (>= 4.0.6)
      railties (>= 5.1)
-    haml_lint (0.43.0)
+    haml_lint (0.45.0)
      haml (>= 4.0, < 6.2)
      parallel (~> 1.10)
      rainbow
@@ -302,8 +303,8 @@ GEM
      multi_json (>= 1.9.2)
      webrick
    highline (2.0.3)
-    httparty (0.18.1)
-      mime-types (~> 3.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
    i18n (1.12.0)
      concurrent-ruby (~> 1.0)
@@ -338,24 +339,26 @@ GEM
      concurrent-ruby
      railties (>= 4.1)
    jsonapi-swagger (0.8.1)
-    jwt (2.3.0)
    kgio (2.11.4)
    kramdown (2.4.0)
      rexml
    launchy (2.5.0)
      addressable (~> 2.7)
-    leaflet-rails (1.9.2)
+    leaflet-rails (1.9.3)
      rails (>= 4.2.0)
    letter_opener (1.8.1)
      launchy (>= 2.2, < 3)
-    listen (3.7.1)
+    listen (3.8.0)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    loofah (2.19.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.1)
      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
    mailboxer (0.15.1)
      carrierwave (>= 0.5.8)
      rails (>= 5.0.0)
@@ -370,97 +373,84 @@ GEM
    memoizable (0.4.2)
      thread_safe (~> 0.3, >= 0.3.1)
    method_source (1.0.0)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
    mimemagic (0.4.3)
      nokogiri (~> 1)
      rake
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
    mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
    moneta (1.0.0)
    multi_json (1.15.0)
    multi_xml (0.6.0)
    multipart-post (2.2.3)
-    net-imap (0.3.1)
+    net-imap (0.3.4)
+      date
      net-protocol
    net-pop (0.1.2)
      net-protocol
-    net-protocol (0.1.3)
+    net-protocol (0.2.1)
      timeout
    net-smtp (0.3.3)
      net-protocol
    nio4r (2.5.8)
-    nokogiri (1.13.10)
+    nokogiri (1.14.2)
      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.2-x86_64-linux)
      racc (~> 1.4)
    oauth (0.5.6)
-    oauth2 (1.4.9)
-      faraday (>= 0.17.3, < 3.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    oj (3.13.23)
+    oj (3.14.2)
    omniauth (1.9.2)
      hashie (>= 3.4.6)
      rack (>= 1.6.2, < 3)
-    omniauth-facebook (9.0.0)
-      omniauth-oauth2 (~> 1.2)
    omniauth-flickr (0.0.20)
      multi_json (~> 1.12)
      omniauth-oauth (~> 1.0)
    omniauth-oauth (1.1.0)
      oauth
      omniauth (~> 1.0)
-    omniauth-oauth2 (1.7.2)
-      oauth2 (~> 1.4)
-      omniauth (>= 1.9, < 3)
    omniauth-twitter (1.4.0)
      omniauth-oauth (~> 1.1)
      rack
    orm_adapter (0.5.0)
    parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.1.1)
      ast (~> 2.4.1)
    percy-capybara (5.0.0)
      capybara (>= 3)
-    pg (1.4.5)
+    pg (1.4.6)
    platform-api (3.5.0)
      heroics (~> 0.1.1)
      moneta (~> 1.0.0)
      rate_throttle_client (~> 0.1.0)
    popper_js (1.16.1)
-    public_suffix (5.0.0)
-    puma (6.0.0)
+    public_suffix (5.0.1)
+    puma (6.1.1)
      nio4r (~> 2.0)
    query_diet (0.7.1)
-    racc (1.6.1)
-    rack (2.2.4)
-    rack-cors (1.1.1)
+    racc (1.6.2)
+    rack (2.2.6.3)
+    rack-cors (2.0.0)
      rack (>= 2.0.0)
-    rack-protection (3.0.4)
+    rack-protection (3.0.5)
      rack
    rack-test (2.0.2)
      rack (>= 1.3)
-    rails (7.0.4)
-      actioncable (= 7.0.4)
-      actionmailbox (= 7.0.4)
-      actionmailer (= 7.0.4)
-      actionpack (= 7.0.4)
-      actiontext (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activemodel (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    rails (7.0.4.2)
+      actioncable (= 7.0.4.2)
+      actionmailbox (= 7.0.4.2)
+      actionmailer (= 7.0.4.2)
+      actionpack (= 7.0.4.2)
+      actiontext (= 7.0.4.2)
+      actionview (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activemodel (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activestorage (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
      bundler (>= 1.15.0)
-      railties (= 7.0.4)
+      railties (= 7.0.4.2)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@@ -468,9 +458,9 @@ GEM
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
      loofah (~> 2.19, >= 2.19.1)
-    rails-i18n (7.0.5)
+    rails-i18n (7.0.6)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 8)
    rails_12factor (0.0.3)
@@ -478,9 +468,9 @@ GEM
      rails_stdout_logging
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    railties (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
@@ -489,15 +479,15 @@ GEM
    raindrops (0.20.0)
    rake (13.0.6)
    rate_throttle_client (0.1.2)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
-    redis-client (0.11.2)
+    redis-client (0.12.2)
      connection_pool
-    regexp_parser (2.6.1)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
+    regexp_parser (2.7.0)
+    responders (3.1.0)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
    rexml (3.2.5)
    rspec (3.11.0)
      rspec-core (~> 3.11.0)
@@ -539,25 +529,28 @@ GEM
    rswag-ui (2.8.0)
      actionpack (>= 3.1, < 7.1)
      railties (>= 3.1, < 7.1)
-    rubocop (1.40.0)
+    rubocop (1.48.0)
      json (~> 2.3)
      parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 1.8, < 3.0)
      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
-      parser (>= 3.1.1.0)
-    rubocop-rails (2.17.3)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.27.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.1)
+      rubocop (~> 1.41)
+    rubocop-rails (2.18.0)
      activesupport (>= 4.2.0)
      rack (>= 1.1)
      rubocop (>= 1.33.0, < 2.0)
-    rubocop-rspec (2.16.0)
+    rubocop-rspec (2.19.0)
      rubocop (~> 1.33)
-    ruby-progressbar (1.11.0)
+      rubocop-capybara (~> 2.17)
+    ruby-progressbar (1.13.0)
    ruby-units (3.0.0)
    ruby-vips (2.1.4)
      ffi (~> 1.12)
@@ -584,11 +577,11 @@ GEM
      activemodel (>= 5)
      elasticsearch (>= 6, < 7.14)
      hashie
-    selenium-webdriver (4.7.1)
+    selenium-webdriver (4.8.1)
      rexml (~> 3.2, >= 3.2.5)
      rubyzip (>= 1.2.2, < 3.0)
      websocket (~> 1.0)
-    sidekiq (7.0.2)
+    sidekiq (7.0.6)
      concurrent-ruby (< 2)
      connection_pool (>= 2.3.0)
      rack (>= 2.2.4)
@@ -608,20 +601,20 @@ GEM
      sprockets (>= 3.0.0)
    ssrf_filter (1.0.7)
    sysexits (1.2.0)
-    temple (0.9.1)
+    temple (0.10.0)
    terminal-table (3.0.2)
      unicode-display_width (>= 1.1.1, < 3)
    thor (1.2.1)
    thread_safe (0.3.6)
-    tilt (2.0.11)
+    tilt (2.1.0)
    timecop (0.9.6)
-    timeout (0.3.0)
+    timeout (0.3.2)
    trollop (1.16.2)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
    uglifier (4.2.0)
      execjs (>= 0.3.0, < 3)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
    unicorn (6.1.0)
      kgio (~> 2.6)
      raindrops (~> 0.7)
@@ -651,7 +644,7 @@ GEM
      webrick
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)

 PLATFORMS
  ruby
@@ -716,7 +709,6 @@ DEPENDENCIES
  memcachier
  oj
  omniauth (~> 1.3)
-  omniauth-facebook
  omniauth-flickr (>= 0.0.15)
  omniauth-twitter
  percy-capybara (~> 5.0.0)
@@ -759,7 +751,7 @@ DEPENDENCIES
  xmlrpc

 RUBY VERSION
-   ruby 3.1.2p20
+   ruby 3.1.3p185

 BUNDLED WITH
   2.3.11
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ encourage participation from people of all backgrounds and skill levels.
 * [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're
  working on, known bugs, etc)
 * [![Gitter](https://badges.gitter.im/Growstuff/growstuff.svg)](https://gitter.im/Growstuff/growstuff?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-* [Wiki](https://github.com/Growstuff/growstuff/wiki) (general documentation, etc. Help by migrating from the [old wiki](https://web.archive.org/web/*/wiki.growstuff.org))
+* [Wiki](https://github.com/Growstuff/growstuff/wiki) (general documentation, etc.)

 ## For coders

@@ -29,7 +29,6 @@ frontend features. We welcome contributions -- see
 [CONTRIBUTING](CONTRIBUTING.md) for details.

 * To set up your development environment, see [Getting started](https://github.com/Growstuff/growstuff/wiki/New-contributor-guide).
-* We encourage [pair programming](http://wiki.growstuff.org/index.php/Pairing), especially for newer developers.
 * You may also be interested in our [API](https://github.com/Growstuff/growstuff/wiki/API).

 ## For designers, writers, researchers, data wranglers, and other contributors
--- a/app/assets/javascripts/cropmap.js.erb
+++ b/app/assets/javascripts/cropmap.js.erb
@@ -1,10 +1,6 @@
 function showCropMap(cropmap) {
-  var mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_map_id %>";
-  var mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_access_token %>";
-  var mapbox_base_url = "https://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token;
-
-  L.tileLayer(mapbox_base_url, {
-    attribution: 'Map data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors under <a href="https://www.openstreetmap.org/copyright">ODbL</a> | Map imagery &copy; <a href="https://mapbox.com">Mapbox</a>',
+  L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
    maxZoom: 18
  }).addTo(cropmap);
  var markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 20 });
--- a/app/assets/javascripts/members.js.erb
+++ b/app/assets/javascripts/members.js.erb
@@ -1,10 +1,4 @@
 if (document.getElementById("membermap") !== null) {
-  var mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_map_id %>";
-  var mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_access_token %>";
-  var mapbox_base_url = "https://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token;
-
-  L.Icon.Default.imagePath = '/assets'
-
  L.Icon.Default.imagePath = '/assets';

  var default_marker_icon = L.icon({
@@ -18,8 +12,8 @@ if (document.getElementById("membermap") !== null) {
    if (member.latitude && member.longitude) {
      var membermap = L.map('membermap').setView([member.latitude, member.longitude], 4);

-      L.tileLayer(mapbox_base_url, {
-        attribution: 'Map data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors under <a href="https://www.openstreetmap.org/copyright">ODbL</a> | Map imagery &copy; <a href="https://mapbox.com">Mapbox</a>',
+      L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
        maxZoom: 18
      }).addTo(membermap);
      var marker = new L.Marker(new L.LatLng(member.latitude, member.longitude),
--- a/app/assets/javascripts/places.js.erb
+++ b/app/assets/javascripts/places.js.erb
@@ -1,8 +1,5 @@
 if (document.getElementById("placesmap") !== null) {
  var places_base_path = "/places";
-  var mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_map_id %>";
-  var mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_access_token %>";
-  var mapbox_base_url = "https://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token;
  var nominatim_base_url = 'https://nominatim.openstreetmap.org/search/';
  var nominatim_user_agent_email = "<%= Rails.env == 'test' ? 0 : Rails.application.config.user_agent_email %>";

@@ -31,8 +28,8 @@ if (document.getElementById("placesmap") !== null) {
 }

 function showMap(placesmap) {
-  L.tileLayer(mapbox_base_url, {
-    attribution: 'Map data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors under <a href="https://www.openstreetmap.org/copyright">ODbL</a> | Map imagery &copy; <a href="https://mapbox.com">Mapbox</a>',
+  L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
    maxZoom: 18
  }).addTo(placesmap);

--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -18,7 +18,6 @@ class MembersController < ApplicationController
    @member        = Member.confirmed.kept.find_by!(slug: params[:slug])
    @twitter_auth  = @member.auth('twitter')
    @flickr_auth   = @member.auth('flickr')
-    @facebook_auth = @member.auth('facebook')
    @posts         = @member.posts

    @activity = TimelineService.member_query(@member).limit(30)
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -9,10 +9,6 @@ require './lib/actions/oauth_signup_action'
 # Heavily overlaps with Authentications controller
 #
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  def facebook
-    create
-  end
-
  def failure
    flash[:alert] = "Authentication failed."
    redirect_to request.env['omniauth.origin'] || "/"
@@ -32,7 +28,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
    @authentication = action.establish_authentication(auth, member)

    if action.member_created?
-      raise "Invalid provider" unless %w(facebook twitter flickr).index(auth['provider'].to_s)
+      raise "Invalid provider" unless %w(twitter flickr).index(auth['provider'].to_s)

      session["devise.#{auth['provider']}_data"] = request.env["omniauth.auth"]
      sign_in member
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -6,7 +6,6 @@ class RegistrationsController < Devise::RegistrationsController
  def edit
    @twitter_auth  = current_member.auth('twitter')
    @flickr_auth   = current_member.auth('flickr')
-    @facebook_auth = current_member.auth('facebook')
    render "edit"
  end

--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -19,7 +19,7 @@
        %p
          %span.help-block
            For detailed crop wrangling guidelines, please consult the
-            = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
+            = link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
            on the Growstuff wiki.

      -# Everyone (wranglers and requesters) sees the basic info section
--- a/app/views/devise/registrations/_edit_apps.html.haml
+++ b/app/views/devise/registrations/_edit_apps.html.haml
@@ -28,17 +28,3 @@
                    method: :delete, class: "remove btn btn-danger"
        - else
          = link_to 'Connect to Flickr', '/members/auth/flickr', class: 'btn'
-
-  .row
-    .col-md-12
-      %p
-        = image_tag "facebook_32.png", size: "32x32", alt: 'Facebook logo'
-        - if @facebook_auth
-          You are connected to Facebook as
-          = succeed "." do
-            = link_to @facebook_auth.name, "https://facebook.com/profile/#{@facebook_auth.uid}"
-          = link_to "Disconnect", @facebook_auth,
-                    confirm: "Are you sure you want to remove this connection?",
-                    method: :delete, class: "remove btn btn-danger"
-        - else
-          = link_to 'Connect to Facebook', '/members/auth/facebook', class: 'btn'
--- a/app/views/members/_contact.html.haml
+++ b/app/views/members/_contact.html.haml
@@ -1,4 +1,4 @@
- if twitter_auth || flickr_auth || facebook_auth || member.show_email
+- if twitter_auth || flickr_auth || member.show_email
  %h4 Contact

  - if twitter_auth
@@ -11,11 +11,6 @@
      = image_tag "flickr_32.png", size: "32x32", alt: 'Flickr logo'
      = link_to flickr_auth.name, "https://flickr.com/photos/#{flickr_auth.uid}"

-  - if facebook_auth
-    %p
-      = image_tag "facebook_32.png", size: "32x32", alt: 'Facebook logo'
-      = link_to facebook_auth.name, "https://facebook.com/profile/#{facebook_auth.uid}"
-
  - if member.show_email
    %p
      Email:
--- a/app/views/members/_member.haml
+++ b/app/views/members/_member.haml
@@ -1,19 +1,18 @@
 - cache member do
  .card.card-double
    .card-body
-      .row
-        .col-12.col-md-6
-          = render "members/avatar", member: member
-        .col-12.col-md-6
-          %h4.login-name= link_to member, member
-          = link_to "view all #{member}'s gardens", member_gardens_path(member)
-          %p
-            %small
-              Joined
-              = distance_of_time_in_words(member.created_at, Time.zone.now)
-              ago.
-          - if member.location.present?
-            = link_to member.location, place_path(member.location)
+      %h4.login-name= link_to member, member
+      %div
+        = render "members/avatar", member: member
+      %div
+        = link_to "view all #{member}'s gardens", member_gardens_path(member)
+        %p
+          %small
+            Joined
+            = distance_of_time_in_words(member.created_at, Time.zone.now)
+            ago.
+        - if member.location.present?
+          = link_to member.location, place_path(member.location)
    .card-footer
      %ul.nav.nav-justified.small
        %li.nav-item.border-right
--- a/app/views/members/_stats.html.haml
+++ b/app/views/members/_stats.html.haml
@@ -2,39 +2,39 @@
  %h3 Activity
 %ul.list-group.list-group-flush
  %li.list-group-item
-    - if !member.gardens.empty?
+    - if member.gardens.present?
      = link_to localize_plural(member.gardens, Garden), member_gardens_path(member)
    - else
      0 gardens
  %li.list-group-item
-    - if !member.plantings.empty?
+    - if member.plantings.present?
      = link_to localize_plural(member.plantings, Planting), member_plantings_path(member)
    - else
      0 plantings
  %li.list-group-item
-    - if !member.harvests.empty?
+    - if member.harvests.present?
      = link_to localize_plural(member.harvests, Harvest), member_harvests_path(member)
    - else
      0 harvests
  %li.list-group-item
-    - if !member.seeds.empty?
+    - if member.seeds.present?
      = link_to localize_plural(member.seeds, Seed), member_seeds_path(member)
    - else
      0 seeds
  %li.list-group-item
-    - if !member.posts.empty?
+    - if member.posts.present?
      = link_to localize_plural(member.posts, Post), member_posts_path(member)
    - else
      0 posts

  %li.list-group-item
-    - if !member.followed.empty?
+    - if member.followed.present?
      = link_to localize_plural(member.followed, Follow), member_follows_path(member)
    - else
      0 following

  %li.list-group-item
-    - if !member.followers.empty?
+    - if member.followers.present?
      = link_to pluralize(member.followers.size, "follower"), member_followers_path(member)
    - else
      0 followers
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -57,8 +57,7 @@
      = render "stats", member: @member
      .card-footer
        = render "contact", member: @member, twitter_auth: @twitter_auth,
-                                              flickr_auth: @flickr_auth,
-                                              facebook_auth: @facebook_auth
+                                              flickr_auth: @flickr_auth

  .col-md-10
    %section= render "map", member: @member
--- a/app/views/places/_search_form.html.haml
+++ b/app/views/places/_search_form.html.haml
@@ -1,6 +1,6 @@
 %form.form-inline{ action: search_places_path, method: :get, role: 'form' }
  .form-group
    = label_tag :new_place, "Change location:", class: 'sr-only'
-    = text_field_tag :new_place, '', class: 'form-control', placeholder: "New location..."
+    = text_field_tag :new_place, '', class: 'form-control', placeholder: "Search for city, suburb or state..."
  = submit_tag "Search", class: 'btn btn-primary', id: "search_button"
 %br/
--- a/app/views/posts/_summary.html.haml
+++ b/app/views/posts/_summary.html.haml
@@ -2,10 +2,10 @@
 - unless posts.empty?
  %table.table.table-striped
    %tr
-      %th Subject
-      %th.hidden-xs Posted by
-      %th Most recent activity
-      %th.hidden-xs Comments
+      %th.col-6 Subject
+      %th.col-2.hidden-xs Posted by
+      %th.col-2 Most recent activity
+      %th.col-2.hidden-xs Comments

    - posts.recently_active[0..howmany - 1].each do |post|
      - cache post do
--- a/config/application.rb
+++ b/config/application.rb
@@ -23,6 +23,8 @@ module Growstuff
    config.time_zone = 'UTC'
    config.active_record.default_timezone = :local

+    config.active_record.yaml_column_permitted_classes = [Symbol, Date, Time, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone]
+
    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
    I18n.load_path += Dir[Rails.root.join('config', 'locales', '*.{rb,yml}')]
    I18n.default_locale = :en
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -69,11 +69,6 @@ Rails.application.configure do
  config.host = 'localhost:3000'
  config.analytics_code = ''

-  # this config variable cannot be put in application.yml as it is needed
-  # by the assets pipeline, which doesn't have access to ENV.
-  config.mapbox_map_id = 'growstuff.i3n2il6a'
-  config.mapbox_access_token = 'pk.eyJ1IjoiZ3Jvd3N0dWZmIiwiYSI6IkdxMkx4alUifQ.n0igaBsw97s14zMa0lwKCA'
-
  config.action_controller.action_on_unpermitted_parameters = :raise

  config.active_job.queue_adapter = :sidekiq
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -109,11 +109,6 @@ Rails.application.configure do
    <noscript><p><img alt="Clicky" width="1" height="1" src="//in.getclicky.com/100594260ns.gif" /></p></noscript>
  eos

-  # this config variable cannot be put in application.yml as it is needed
-  # by the assets pipeline, which doesn't have access to ENV.
-  config.mapbox_map_id = ENV['GROWSTUFF_MAPBOX_MAP_ID']
-  config.mapbox_access_token = ENV['GROWSTUFF_MAPBOX_ACCESS_TOKEN']
-
  config.active_job.queue_adapter = :sidekiq
  # Use a different logger for distributed setups.
  # require 'syslog/logger'
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -104,16 +104,3 @@ Capybara.configure do |config|
 end

 OmniAuth.config.test_mode = true
-# Fake the omniauth
-OmniAuth.config.mock_auth[:facebook] = OmniAuth::AuthHash.new(provider:    'facebook',
-                                                              uid:         '123545',
-                                                              info:        {
-                                                                name:     "John Testerson",
-                                                                nickname: 'JohnnyT',
-                                                                email:    'example.oauth.facebook@example.com',
-                                                                image:    'http://findicons.com/files/icons/1072/face_avatars/300/i04.png'
-                                                              },
-                                                              credentials: {
-                                                                token:  "token",
-                                                                secret: "donttell"
-                                                              })
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -233,8 +233,4 @@ Devise.setup do |config|
  # When using omniauth, Devise cannot automatically set Omniauth path,
  # so you need to do it manually. For the users scope, it would be:
  # config.omniauth_path_prefix = "/my_engine/users/auth"
-
-  # Later we may wish to ask for user_photos,user_location, however this means we need to be reviewed by facebook
-  config.omniauth :facebook, ENV['GROWSTUFF_FACEBOOK_KEY'], ENV['GROWSTUFF_FACEBOOK_SECRET'], scope: 'email,public_profile',
-display: 'page', info_fields: 'email,name,first_name,last_name,id'
 end
--- a/db/migrate/20191119020643_upgrade_cms.rb
+++ b/db/migrate/20191119020643_upgrade_cms.rb
@@ -23,9 +23,9 @@ class UpgradeCms < ActiveRecord::Migration[5.2]
      t.string  :locale,    null: false
      t.integer :page_id,   null: false
      t.integer :layout_id
-      t.string  :label,           null: false
-      t.text    :content_cache,   limit: limit
-      t.boolean :is_published,    null: false, default: true
+      t.string  :label, null: false
+      t.text(:content_cache, limit:)
+      t.boolean :is_published, null: false, default: true
      t.timestamps

      t.index [:page_id]
--- a/db/migrate/20230313015323_create_active_storage_tables.active_storage.rb
+++ b/db/migrate/20230313015323_create_active_storage_tables.active_storage.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :active_storage_blobs, id: primary_key_type do |t|
+      t.string   :key,          null: false
+      t.string   :filename,     null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.string   :service_name, null: false
+      t.bigint   :byte_size,    null: false
+      t.string   :checksum
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [:key], unique: true
+    end
+
+    create_table :active_storage_attachments, id: primary_key_type do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false, type: foreign_key_type
+      t.references :blob,     null: false, type: foreign_key_type
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index %i(record_type record_id name blob_id), name: :index_active_storage_attachments_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+
+    create_table :active_storage_variant_records, id: primary_key_type do |t|
+      t.belongs_to :blob, null: false, index: false, type: foreign_key_type
+      t.string :variation_digest, null: false
+
+      t.index %i(blob_id variation_digest), name: :index_active_storage_variant_records_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+
+  private
+
+  def primary_and_foreign_key_types
+    config = Rails.configuration.generators
+    setting = config.options[config.orm][:primary_key_type]
+    primary_key_type = setting || :primary_key
+    foreign_key_type = setting || :bigint
+    [primary_key_type, foreign_key_type]
+  end
+end
--- a/4
+++ b/4
@@ -50,10 +50,6 @@ GROWSTUFF_TWITTER_SECRET=""
 GROWSTUFF_FLICKR_KEY=""
 GROWSTUFF_FLICKR_SECRET=""

-# https://developers.facebook.com/
-GROWSTUFF_FACEBOOK_KEY=""
-GROWSTUFF_FACEBOOK_SECRET=""
-
 # Elasticsearch is used for flexible search and it requires another component
 # to be installed. To make it easy for people who don't need to test this feature
 # it's been turned off for test and development environment as a default.
--- a/lib/actions/oauth_signup_action.rb
+++ b/lib/actions/oauth_signup_action.rb
@@ -63,7 +63,7 @@ class Growstuff::OauthSignupAction
    case auth['provider']
    when 'twitter'
      auth['info']['nickname']
-    when 'flickr', 'facebook'
+    when 'flickr'
      auth['info']['name']
    else
      auth['info']['name']
--- a/spec/features/signin_spec.rb
+++ b/spec/features/signin_spec.rb
@@ -82,28 +82,4 @@ describe "signin", js: true do
    click_button 'Sign in'
    expect(page).to have_content("There are crops waiting to be wrangled.")
  end
-
-  context "with facebook" do
-    it "sign in" do
-      # Ordinarily done by database_cleaner
-      Member.where(login_name: 'tdawg').delete_all
-
-      create(:member, login_name: 'tdawg', email: 'example.oauth.facebook@example.com')
-
-      # Start the test
-      visit root_path
-      first('.signup a').click
-
-      # Click the signup with facebook link
-
-      first('a[href="/members/auth/facebook"]').click
-      # Magic happens!
-      # See config/environments/test.rb for the fake user
-      # that we pretended to auth as
-
-      # Signed up and logged in
-      expect(page).to have_current_path root_path, ignore_query: true
-      expect(page.text).to include("Welcome to #{ENV['GROWSTUFF_SITE_NAME']}, tdawg")
-    end
-  end
 end
--- a/spec/features/signup_spec.rb
+++ b/spec/features/signup_spec.rb
@@ -45,37 +45,4 @@ describe "signup", js: true do
    click_button 'Sign up'
    expect(page).to have_current_path members_path, ignore_query: true
  end
-
-  context "with facebook" do
-    it "sign up" do
-      # Ordinarily done by database_cleaner
-      Member.where(login_name: 'tdawg').delete_all
-      Member.where(email: 'tdawg@hotmail.com').delete_all
-      Member.where(email: 'example.oauth.facebook@example.com').delete_all
-      Authentication.where(provider: 'facebook', uid: '123545').delete_all
-
-      # Start the test
-      visit root_path
-      first('.signup a').click
-
-      # Click the signup with facebook link
-
-      first('a[href="/members/auth/facebook"]').click
-      # Magic happens!
-      # See config/environments/test.rb for the fake user
-      # that we pretended to auth as
-
-      # Confirm page
-      expect(page).to have_current_path '/members/johnnyt/finish_signup'
-
-      fill_in 'Login name', with: 'tdawg'
-      fill_in 'Email', with: 'tdawg@hotmail.com'
-      check 'member_tos_agreement'
-      click_button 'Continue'
-
-      # Signed up and logged in
-      expect(page).to have_current_path root_path, ignore_query: true
-      expect(page.text).to include("Welcome to #{ENV['GROWSTUFF_SITE_NAME']}, tdawg")
-    end
-  end
 end
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -103,7 +103,6 @@ RSpec.configure do |config|
    if page.driver.browser.respond_to?(:url_blacklist)
      page.driver.browser.url_blacklist = [
        'gravatar.com',
-        'mapbox.com',
        'okfn.org',
        'googlecode.com'
      ]
--- a/spec/views/crops/new.html.haml_spec.rb
+++ b/spec/views/crops/new.html.haml_spec.rb
@@ -16,6 +16,6 @@ describe "crops/new" do
  end

  it "shows a link to crop wrangling guidelines" do
-    assert_select "a[href^='http://wiki.growstuff.org']", "crop wrangling guide"
+    assert_select "a[href^='https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling']", "crop wrangling guide"
  end
 end
--- a/spec/views/scientific_names/edit.html.haml_spec.rb
+++ b/spec/views/scientific_names/edit.html.haml_spec.rb
@@ -18,7 +18,9 @@ describe "scientific_names/edit" do
      expect(rendered).to have_content "Added by #{member} less than a minute ago."
    end

-    xit { expect(rendered).to have_link member_path(member) }
+    it "render member link" do
+      expect(rendered).to have_link member.login_name, href: member_path(member)
+    end

    it "renders the edit scientific_name form" do
      assert_select "form", action: scientific_names_path(scientific_name), method: "post" do
--- a/swagger/v1/swagger.json
+++ b/swagger/v1/swagger.json
@@ -92,13 +92,6 @@
          "type": "string",
          "description": "Display field",
          "required": false
-        },
-        {
-          "name": "fields[crops]",
-          "in": "query",
-          "type": "string",
-          "description": "Display field",
-          "required": false
        }
      ],
      "responses": {
@@ -132,32 +125,32 @@
                        "name": {
                          "type": "string",
                          "x-nullable": false,
-                          "description": null
+                          "description": "Name"
                        },
                        "en_wikipedia_url": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Wikipedia URL (English)"
                        },
                        "perennial": {
                          "type": "boolean",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Is the item perennial? (A plant that lives more than two years)"
                        },
                        "median_lifespan": {
                          "type": "integer",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Median lifespan"
                        },
                        "median_days_to_first_harvest": {
                          "type": "integer",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Median days to first harvest"
                        },
                        "median_days_to_last_harvest": {
                          "type": "integer",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Median days to last harvest"
                        }
                      },
                      "description": "Attributes"
@@ -371,13 +364,6 @@
          "type": "string",
          "description": "Display field",
          "required": false
-        },
-        {
-          "name": "fields[crops]",
-          "in": "query",
-          "type": "string",
-          "description": "Display field",
-          "required": false
        }
      ],
      "responses": {
@@ -413,32 +399,32 @@
                      "name": {
                        "type": "string",
                        "x-nullable": false,
-                        "description": null
+                        "description": "Name"
                      },
                      "en_wikipedia_url": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Wikipedia URL (English)"
                      },
                      "perennial": {
                        "type": "boolean",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Is the item perennial? (A plant that lives more than two years)"
                      },
                      "median_lifespan": {
                        "type": "integer",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Median lifespan"
                      },
                      "median_days_to_first_harvest": {
                        "type": "integer",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Median days to first harvest"
                      },
                      "median_days_to_last_harvest": {
                        "type": "integer",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Median days to last harvest"
                      }
                    },
                    "description": "Attributes"
@@ -666,7 +652,7 @@
                        "name": {
                          "type": "string",
                          "x-nullable": false,
-                          "description": null
+                          "description": "Name"
                        }
                      },
                      "description": "Attributes"
@@ -868,7 +854,7 @@
                      "name": {
                        "type": "string",
                        "x-nullable": false,
-                        "description": null
+                        "description": "Name"
                      }
                    },
                    "description": "Attributes"
@@ -1084,12 +1070,12 @@
                        "login_name": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Login name"
                        },
                        "slug": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Slug"
                        }
                      },
                      "description": "Attributes"
@@ -1345,12 +1331,12 @@
                      "login_name": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Login name"
                      },
                      "slug": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Slug"
                      }
                    },
                    "description": "Attributes"
@@ -1585,32 +1571,32 @@
                        "harvested_at": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Harvested date time"
                        },
                        "description": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Description"
                        },
                        "unit": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Unit"
                        },
                        "weight_quantity": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Weight/Quanitity"
                        },
                        "weight_unit": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Weight Unit"
                        },
                        "si_weight": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "SI Weight"
                        }
                      },
                      "description": "Attributes"
@@ -1839,32 +1825,32 @@
                      "harvested_at": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Harvested datetime"
                      },
                      "description": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Description"
                      },
                      "unit": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Unit"
                      },
                      "weight_quantity": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Weight/Quantity"
                      },
                      "weight_unit": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Weight Unit"
                      },
                      "si_weight": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "SI Weight"
                      }
                    },
                    "description": "Attributes"
@@ -2065,47 +2051,47 @@
                        "description": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Description"
                        },
                        "quantity": {
                          "type": "integer",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Quanitity"
                        },
                        "plant_before": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Plant before"
                        },
                        "tradable_to": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Tradeable to"
                        },
                        "days_until_maturity_min": {
                          "type": "integer",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Days until maturity (min)"
                        },
                        "days_until_maturity_max": {
                          "type": "integer",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Days until maturity (max)"
                        },
                        "organic": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Organic"
                        },
                        "gmo": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "GMO"
                        },
                        "heirloom": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Heirloom"
                        }
                      },
                      "description": "Attributes"
@@ -2280,47 +2266,47 @@
                      "description": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Description"
                      },
                      "quantity": {
                        "type": "integer",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Quanity"
                      },
                      "plant_before": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Plant before"
                      },
                      "tradable_to": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Tradable to"
                      },
                      "days_until_maturity_min": {
                        "type": "integer",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Days until maturity (min)"
                      },
                      "days_until_maturity_max": {
                        "type": "integer",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Days until maturity (max)"
                      },
                      "organic": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Organic"
                      },
                      "gmo": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "GMO"
                      },
                      "heirloom": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Heirloom"
                      }
                    },
                    "description": "Attributes"
@@ -2537,42 +2523,42 @@
                        "slug": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Slug"
                        },
                        "planted_at": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Planted at"
                        },
                        "finished": {
                          "type": "boolean",
                          "x-nullable": false,
-                          "description": null
+                          "description": "Finished?"
                        },
                        "finished_at": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Finished at"
                        },
                        "quantity": {
                          "type": "integer",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Quanity"
                        },
                        "description": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Description"
                        },
                        "sunniness": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Sunniness"
                        },
                        "planted_from": {
                          "type": "string",
                          "x-nullable": true,
-                          "description": null
+                          "description": "Planted from"
                        }
                      },
                      "description": "Attributes"
@@ -2801,42 +2787,42 @@
                      "slug": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Slug"
                      },
                      "planted_at": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Planted at"
                      },
                      "finished": {
                        "type": "boolean",
                        "x-nullable": false,
-                        "description": null
+                        "description": "Finished?"
                      },
                      "finished_at": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Finished at"
                      },
                      "quantity": {
                        "type": "integer",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Quantity"
                      },
                      "description": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Description"
                      },
                      "sunniness": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Sunniness"
                      },
                      "planted_from": {
                        "type": "string",
                        "x-nullable": true,
-                        "description": null
+                        "description": "Planted from"
                      }
                    },
                    "description": "Attributes"
@@ -3051,27 +3037,27 @@
                        "thumbnail_url": {
                          "type": "string",
                          "x-nullable": false,
-                          "description": null
+                          "description": "Thumbnail URL"
                        },
                        "fullsize_url": {
                          "type": "string",
                          "x-nullable": false,
-                          "description": null
+                          "description": "Full-size URL"
                        },
                        "license_name": {
                          "type": "string",
                          "x-nullable": false,
-                          "description": null
+                          "description": "License name"
                        },
                        "link_url": {
                          "type": "string",
                          "x-nullable": false,
-                          "description": null
+                          "description": "Link URL"
                        },
                        "title": {
                          "type": "string",
                          "x-nullable": false,
-                          "description": null
+                          "description": "Title"
                        }
                      },
                      "description": "Attributes"
@@ -3300,27 +3286,27 @@
                      "thumbnail_url": {
                        "type": "string",
                        "x-nullable": false,
-                        "description": null
+                        "description": "Thumbnail URL"
                      },
                      "fullsize_url": {
                        "type": "string",
                        "x-nullable": false,
-                        "description": null
+                        "description": "Full-size URL"
                      },
                      "license_name": {
                        "type": "string",
                        "x-nullable": false,
-                        "description": null
+                        "description": "License name"
                      },
                      "link_url": {
                        "type": "string",
                        "x-nullable": false,
-                        "description": null
+                        "description": "Link URL"
                      },
                      "title": {
                        "type": "string",
                        "x-nullable": false,
-                        "description": null
+                        "description": "Title"
                      }
                    },
                    "description": "Attributes"
@@ -1 +1 @@
 .1.2
 .1.3