[ARVADOS] updated: 1.3.0-936-ga551aee4b

[Git user]

Summary of changes:
 apps/workbench/app/controllers/actions_controller.rb          | 1 +
 apps/workbench/app/controllers/status_controller.rb           | 2 ++
 apps/workbench/config/application.rb                          | 7 +------
 apps/workbench/config/initializers/validate_wb2_url_config.rb | 2 ++
 apps/workbench/test/integration/application_layout_test.rb    | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

       via  a551aee4b86197ac9053b4902f8ab0bd4c92af90 (commit)
       via  290b928db36280b3faf76161b2bd563a4057a4c7 (commit)
      from  4837e08b7c338f4d25be24346c02c6cfb62aaccb (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 a551aee4b86197ac9053b4902f8ab0bd4c92af90
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Thu May 23 10:14:21 2019 -0300

    15258: Explicitly require libs instead of relying on autoloading.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 4f77a1be4..b1bbb1226 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 require "arvados/collection"
+require "app_version"
 
 class ActionsController < ApplicationController
 
diff --git a/apps/workbench/app/controllers/status_controller.rb b/apps/workbench/app/controllers/status_controller.rb
index 0a8fb5a28..0e45daa1d 100644
--- a/apps/workbench/app/controllers/status_controller.rb
+++ b/apps/workbench/app/controllers/status_controller.rb
@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+require "app_version"
+
 class StatusController < ApplicationController
   skip_around_action :require_thread_api_token
   skip_before_action :find_object_by_uuid
diff --git a/apps/workbench/config/initializers/validate_wb2_url_config.rb b/apps/workbench/config/initializers/validate_wb2_url_config.rb
index f9096486c..0a8f07c4b 100644
--- a/apps/workbench/config/initializers/validate_wb2_url_config.rb
+++ b/apps/workbench/config/initializers/validate_wb2_url_config.rb
@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+require 'config_validators'
+
 include ConfigValidators
 
 ConfigValidators::validate_wb2_url_config()
\ No newline at end of file
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index b3f704cdd..51c372098 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 require 'integration_helper'
+require 'config_validators'
 
 class ApplicationLayoutTest < ActionDispatch::IntegrationTest
   # These tests don't do state-changing API calls. Save some time by

commit 290b928db36280b3faf76161b2bd563a4057a4c7
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Thu May 23 09:52:10 2019 -0300

    15258: Removes /lib from eager load paths because of failing integration tests.
    
    PhantomJS started to randomly fail, maybe because of memory or timing reasons.
    This change exposes the bug observed on production, on development & test envs.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/config/application.rb b/apps/workbench/config/application.rb
index c8a722f0b..1c7a9d0da 100644
--- a/apps/workbench/config/application.rb
+++ b/apps/workbench/config/application.rb
@@ -26,14 +26,9 @@ module ArvadosWorkbench
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
     # Autoload paths shouldn't be used anymore since Rails 5.0
     # See #15258 and https://github.com/rails/rails/issues/13142#issuecomment-74586224
-    config.eager_load_paths += %W(#{config.root}/lib)
-
-    # Load entire application at startup.
-    config.eager_load = true
+    # config.autoload_paths += %W(#{config.root}/extras)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.

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


hooks/post-receive
--