[ARVADOS] updated: 2.1.0-2207-g39cfbff06

[Git user]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb | 2 +-
 build/run-tests.sh                                       | 6 ++++++
 services/api/test/fixtures/jobs.yml                      | 4 ++--
 services/api/test/fixtures/pipeline_instances.yml        | 6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)

       via  39cfbff065282869d8dadab2474dfaae4ba0b86a (commit)
      from  719122b03dda6cabcd1dc52805fa8607d18004cc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 39cfbff065282869d8dadab2474dfaae4ba0b86a
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Apr 4 14:02:40 2022 -0400

    18943: Fix workbench bug
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 5312e733f..f8c8079a1 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -172,7 +172,7 @@ class ApplicationController < ActionController::Base
 
   def find_objects_for_index
     @objects ||= model_class
-    @objects = @objects.filter(@filters).limit(@limit).offset(@offset)
+    @objects = @objects.filter(@filters).limit(@limit).offset(@offset).order(@order)
     @objects.fetch_multiple_pages(false)
   end
 
diff --git a/build/run-tests.sh b/build/run-tests.sh
index 3592efbdc..67c54c98b 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -556,6 +556,12 @@ setup_ruby_environment() {
             done
             "$bundle" version | tee /dev/stderr | grep -q 'version 2'
         ) || fatal 'install bundler'
+	if test -d /var/lib/arvados-arvbox/ ; then
+	    # Inside arvbox, use bundler-installed binstubs.  The
+	    # system bundler and rail's own bin/bundle refuse to work.
+	    # I don't know why.
+	    bundle=binstubs/bundle
+	fi
     fi
 }
 
diff --git a/services/api/test/fixtures/jobs.yml b/services/api/test/fixtures/jobs.yml
index ab7641790..9280aeab9 100644
--- a/services/api/test/fixtures/jobs.yml
+++ b/services/api/test/fixtures/jobs.yml
@@ -8,8 +8,8 @@ running:
   cancelled_at: ~
   cancelled_by_user_uuid: ~
   cancelled_by_client_uuid: ~
-  created_at: <%= 3.minute.ago.to_s(:db) %>
-  started_at: <%= 3.minute.ago.to_s(:db) %>
+  created_at: <%= 2.7.minute.ago.to_s(:db) %>
+  started_at: <%= 2.7.minute.ago.to_s(:db) %>
   finished_at: ~
   script: hash
   repository: active/foo
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index 2a8be893c..a504c9fad 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -97,7 +97,7 @@ has_job:
   state: Ready
   uuid: zzzzz-d1hrv-1yfj6xkidf2muk3
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 2.1.minute.ago.to_s(:db) %>
+  created_at: <%= 2.9.minute.ago.to_s(:db) %>
   components:
    foo:
     script: foo
@@ -363,8 +363,8 @@ pipeline_in_running_state:
   name: running_with_job
   uuid: zzzzz-d1hrv-runningpipeline
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 3.1.minute.ago.to_s(:db) %>
-  started_at: <%= 3.1.minute.ago.to_s(:db) %>
+  created_at: <%= 2.8.minute.ago.to_s(:db) %>
+  started_at: <%= 2.8.minute.ago.to_s(:db) %>
   state: RunningOnServer
   components:
    foo:

-----------------------------------------------------------------------


hooks/post-receive
--