Merge branch '21815-trigrams-exclude-ids'

Closes #21815.

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

diff --cc doc/admin/upgrading.html.textile.liquid
index b6f6a2fd413d30bfc2920222b460ca7fd9fa6113,3b0dc4554b943308b05ba07783e788b57c5f16ce..2a36481023e1da71d3c5b6ecb9753e7e38c117d4
--- 1/doc/admin/upgrading.html.textile.liquid
--- 2/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@@ -46,18 -46,10 +46,22 @@@ Some Arvados packages, most notably th
  
  If you have a custom install that requires a different version of Ruby than the one included with your distribution, you must configure your system to ensure package scripts find that version of @ruby@ before any others. For example, you might do this on Debian-based distributions by customizing apt's @DPkg::Path@ setting.
  
+ h3. Slow migration on upgrade
+ 
+ This upgrade includes a database schema update to rebuild full text search indexes to remove UUID and portable data hash column data.  This will provide better search results to users and take less space on the databaes, but plan for the @arvados-api-server@ package upgrade to take longer than usual.
+ 
 +h3. Configuration entries have been removed or renamed
 +
 +The following configuration keys have been renamed or removed.  Renamed keys will still be loaded if they appear with their old names, but you should update your @/etc/arvados/config.yml@ file to avoid warnings when services start up.
 +* @Containers.JobsAPI.Enable@ has been removed
 +* @Mail.EmailFrom@ has been removed
 +* @Mail.IssueReporterEmailFrom@ has been removed
 +* @Mail.IssueReporterEmailTo@ has been removed
 +* @Mail.MailchimpAPIKey@ has been removed
 +* @Mail.MailchimpListID@ has been removed
 +* @Mail.SendUserSetupNotificationEmail@ has moved to @Users.SendUserSetupNotificationEmail@
 +* @Mail.SupportEmailAddress@ has moved to @Users.SupportEmailAddress@
 +
  h3. S3 volume IAMRole configuration entry has been removed
  
  The @Volumes.*.DriverParameters.IAMRole@ configuration entry for S3 volumes has been removed. You should remove it from your @/etc/arvados/config.yml@ file to avoid warnings when services start up. As before, if @AccessKeyID@ and @SecretAccessKey@ are blank, keepstore will retrieve IAM role credentials from instance metadata. Previously, documentation indicated that keepstore would refuse to use the IAM credentials if @IAMRole@ was specified and did not match the instance metadata, but that check has not been working for some time.

diff --cc services/api/app/models/arvados_model.rb
Simple merge

diff --cc services/api/test/unit/arvados_model_test.rb
Simple merge