[ARVADOS] updated: 1.1.1-260-g9a7f1bb

[Git user]

Summary of changes:
 services/api/app/controllers/arvados/v1/schema_controller.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

       via  9a7f1bba655da249a0445eefa50e92a8b305b753 (commit)
      from  e64b71e098878da66c434b7f7c09d36f2650f38e (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 9a7f1bba655da249a0445eefa50e92a8b305b753
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Dec 14 16:22:08 2017 -0500

    8311: Fix gitUrl discovery doc for config git_repo_https_base: true.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 8ab9332..d4be3c8 100644
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -60,7 +60,14 @@ class Arvados::V1::SchemaController < ApplicationController
         websocketUrl: Rails.application.config.websocket_address,
         workbenchUrl: Rails.application.config.workbench_address,
         keepWebServiceUrl: Rails.application.config.keep_web_service_url,
-        gitUrl: Rails.application.config.git_repo_https_base || "",
+        gitUrl: case Rails.application.config.git_repo_https_base
+                when false
+                  ''
+                when true
+                  'https://git.%s.arvadosapi.com/' % Rails.configuration.uuid_prefix
+                else
+                  Rails.application.config.git_repo_https_base
+                end,
         parameters: {
           alt: {
             type: "string",

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


hooks/post-receive
--