[ARVADOS] updated: 1.2.0-86-g985bfe119

[Git user]

Summary of changes:
 services/api/config/initializers/legacy_jobs_api.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

       via  985bfe119f34bbf39a7007bee1fc1c03db9ab8bf (commit)
      from  9b1e23489c659655134a7e208a012d5d8d05bd07 (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 985bfe119f34bbf39a7007bee1fc1c03db9ab8bf
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Sep 19 15:15:11 2018 -0400

    10865: Fix query for empty jobs table
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/config/initializers/legacy_jobs_api.rb b/services/api/config/initializers/legacy_jobs_api.rb
index 00605725e..eecf337da 100644
--- a/services/api/config/initializers/legacy_jobs_api.rb
+++ b/services/api/config/initializers/legacy_jobs_api.rb
@@ -8,9 +8,11 @@
 require_relative 'load_config.rb'
 
 Server::Application.configure do
+  # Use exec_query because the Job model isn't loaded yet
+  # it returns the string '0', not converted to integer.
   if Rails.configuration.enable_legacy_jobs_api == false ||
      (Rails.configuration.enable_legacy_jobs_api == "auto" &&
-      ActiveRecord::Base.connection.exec_query("select count(*) from jobs")[0] == 0)
+      ActiveRecord::Base.connection.exec_query('select count(*) from jobs').first['count'] == '0')
     Rails.configuration.disable_api_methods = ["jobs.create",
                                                "pipeline_instances.create",
                                                "pipeline_templates.create",

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


hooks/post-receive
--