[ARVADOS] updated: 1.3.0-2866-gf4cb214f1

[Git user]

Summary of changes:
 services/api/app/controllers/arvados/v1/containers_controller.rb | 2 +-
 services/api/config/application.rb                               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  f4cb214f12727b2145f4b9e62a7928c069b0a742 (commit)
      from  7f45a8a8128471a162068a1552f66801a24ec5a8 (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 f4cb214f12727b2145f4b9e62a7928c069b0a742
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Thu Aug 6 09:22:28 2020 -0300

    16470: Don't explicitly reload before locking on CR updates.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/services/api/app/controllers/arvados/v1/containers_controller.rb b/services/api/app/controllers/arvados/v1/containers_controller.rb
index b2324a571..041f55947 100644
--- a/services/api/app/controllers/arvados/v1/containers_controller.rb
+++ b/services/api/app/controllers/arvados/v1/containers_controller.rb
@@ -29,7 +29,7 @@ class Arvados::V1::ContainersController < ApplicationController
   end
 
   def update
-    @object.reload.with_lock do
+    @object.with_lock do
       super
     end
   end
diff --git a/services/api/config/application.rb b/services/api/config/application.rb
index 6bffc9a63..369294e8a 100644
--- a/services/api/config/application.rb
+++ b/services/api/config/application.rb
@@ -9,14 +9,14 @@ require "rails"
 require "active_model/railtie"
 require "active_job/railtie"
 require "active_record/railtie"
-# require "active_storage/engine"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
-# Skip ActionCable (new in Rails 5.0) as it adds '/cable' routes that we're not using
-# require "action_cable/engine"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
+# Skipping the following:
+# * ActionCable (new in Rails 5.0) as it adds '/cable' routes that we're not using
+# * Skip ActiveStorage (new in Rails 5.1)
 
 require 'digest'
 

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


hooks/post-receive
--