Merge branch 'master' of git.curoverse.com:arvados

diff --git a/apps/workbench/app/views/groups/_show_recent.html.erb b/apps/workbench/app/views/groups/_show_recent.html.erb
index 117ddb65da08d07e507151a31f2fbb86b3b3b645..c372b885926664d6e0cbcd4af31e39d683fb6edb 100644 (file)
--- a/apps/workbench/app/views/groups/_show_recent.html.erb
+++ b/apps/workbench/app/views/groups/_show_recent.html.erb
@@ -20,7 +20,7 @@
 
     <tr>
       <td>
-        <%= g.friendly_link_name %>
+        <%= link_to_if_arvados_object g, friendly_name: true %>
       </td><td>
         <%= link_to_if_arvados_object g.owner_uuid, friendly_name: true %>
       </td><td>

diff --git a/docker/doc/Dockerfile b/docker/doc/Dockerfile
index 5ae4bb273b34cbae22f63f3a1c005bb0fb05c6c0..39c87a88a1ca211b02966084144899538f2e29a2 100644 (file)
--- a/docker/doc/Dockerfile
+++ b/docker/doc/Dockerfile
@@ -13,7 +13,7 @@ ADD generated/doc.tar.gz /usr/src/arvados/
 # Build static site
 RUN /bin/sed -ri 's/^baseurl: .*$/baseurl: /' /usr/src/arvados/doc/_config.yml && \
     cd /usr/src/arvados/doc && \
-    LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" jekyll build
+    LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" rake
 
 # Configure Apache
 ADD apache2_vhost /etc/apache2/sites-available/doc

diff --git a/docker/doc/apache2_vhost b/docker/doc/apache2_vhost
index f3d4ff28ae7c0ce2d0517e3390fc34699409152a..bf9c18bb2090b67202b84218acb58ab771e88736 100644 (file)
--- a/docker/doc/apache2_vhost
+++ b/docker/doc/apache2_vhost
@@ -6,7 +6,7 @@ ServerName doc.arvados.org
 
   ServerName doc.arvados.org
 
-  DocumentRoot /usr/src/arvados/doc/_site/
+  DocumentRoot /usr/src/arvados/doc/.site/
 
 </VirtualHost>
 

diff --git a/sdk/perl/lib/Arvados/ResourceMethod.pm b/sdk/perl/lib/Arvados/ResourceMethod.pm
index fd577752b2c706324e1cd4c688ace24ff333938a..cfcc34a4882cc530dff8f9dd3f2959918f6482c3 100644 (file)
--- a/sdk/perl/lib/Arvados/ResourceMethod.pm
+++ b/sdk/perl/lib/Arvados/ResourceMethod.pm
@@ -28,6 +28,15 @@ sub execute
     my %body_params;
     my %given_params = @_;
     my %extra_params = %given_params;
+    if ($method->{'request'}->{'properties'}) {
+       while (my ($prop_name, $prop_value) =
+              each %{$method->{'request'}->{'properties'}}) {
+           if (ref($prop_value) eq 'HASH' && $prop_value->{'$ref'}) {
+               $body_params{$prop_name} = $given_params{$prop_name};
+               delete $extra_params{$prop_name};
+           }
+       }
+    }
     while (my ($param_name, $param) = each %{$method->{'parameters'}}) {
         delete $extra_params{$param_name};
         if ($param->{'required'} && !exists $given_params{$param_name}) {