tweaks: various

.gitignore

@@ -4,14 +4,17 @@
 
 # Secrets.
 /config/database.yml
+/config/settings/*.secret.yml*
 /config/settings/production.secret.yml
 /config/settings/staging.secret.yml
+/secrets
 
 # EngineYard server settings.
 /config/server.yml
 
 # Generated AntCat output.
 /data/antweb_exports/antcat.antweb.txt
+/data/antweb_exports/antcat.antweb.txt.tmp
 /data/antweb_exports/antcat.antweb.txt.stderr.log
 /data/antweb_exports/antcat.antweb.txt.stdout.log
 

Gemfile

@@ -16,9 +16,6 @@ gem 'sassc-rails'
 gem 'sprockets-rails', require: 'sprockets/railtie'
 gem 'uglifier'
 gem 'webpacker', '5.1.1'
-# NOTE: webrick is required for `ReferenceDocument#actual_url`, but specs may incorrectly pass even after removing
-# webrick from here if it happens to be loaded as a dependency for gems in the :test group (for example cucumber-rails).
-gem 'webrick'
 
 gem 'acts_as_list'
 gem 'attr_extras'
@@ -46,12 +43,14 @@ gem 'ruby-progressbar'
 gem 'strip_attributes'
 # TODO: Using GitHub ref for Ruby 3 compatibility, see https://github.com/sunspot/sunspot/issues/1007
 # version must be above at least https://rubygems.org/gems/sunspot_rails/versions/2.5.0
-# Without it, `rake sunspot:reindex` fails with this error:
-#   "ArgumentError: wrong number of arguments (given 1, expected 0) ... `find_in_batches'".
+# Without it, `rake sunspot:reindex` fails with "ArgumentError: wrong number of arguments (given 1, expected 0)".
 gem 'sunspot_rails', github: 'sunspot/sunspot', ref: 'f2f01a6278030d086e0efb141dceefdcca8932bd'
 gem 'sunspot_solr', '2.2.0'
 gem 'twitter-typeahead-rails'
 gem 'unread'
+# NOTE: webrick is required for `ReferenceDocument#actual_url`, but specs may incorrectly pass even after removing
+# webrick from here if it happens to be loaded as a dependency for gems in the :test group (for example cucumber-rails).
+gem 'webrick'
 gem 'will_paginate'
 
 group :development do

app/models/database_scripts/renderers/as_table.rb

@@ -41,7 +41,7 @@ def header *items
         header_content << string
       end
 
-      # Defaults results to the scripts's `#results` unless specified.
+      # Defaults results to the script's `#results` unless specified.
       def rows rows_results = nil
         res = rows_results || results
 

app/services/taxa/link_each_epithet.rb

@@ -6,8 +6,9 @@ class LinkEachEpithet
 
     attr_private_initialize :taxon
 
-    # This links the different parts of the name for species and below,
-    # and just the name for uninomials.
+    # This links individual parts of a name to different catalog pages (species and below).
+    # For genus and above there is only a single name, so just link that (including
+    # subgenera which are actually displayed as two words).
     def call
       return CatalogFormatter.link_to_taxon(taxon) unless taxon.is_a?(::SpeciesGroupTaxon)
 

features/changes/compare_revisions.feature

@@ -49,7 +49,7 @@ Feature: Compare revisions
     And I follow "History"
     Then I should see "This item does not have any previous revisions"
 
-  @javascript
+  @retry_ci @javascript
   Scenario: Comparing revisions with intermediate revisions
     Given there is a history item "initial version"
     And I update the most recent history item to say "second version"

features/reference_sections/edit_references_section.feature

@@ -19,7 +19,7 @@ Feature: Editing references sections
     And I should see "belonging to Atta"
     And I should see the edit summary "added new stuff"
 
-  @javascript
+  @retry_ci @javascript
   Scenario: Editing a reference section (with edit summary)
     Given there is a subfamily "Dolichoderinae" with a reference section "Original reference"