[ARVADOS] updated: 5184743db419caa1dca30b2d15e3b9d1cdb0c51c

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/projects_controller.rb | 3 ++-
 services/api/db/structure.sql                         | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

       via  5184743db419caa1dca30b2d15e3b9d1cdb0c51c (commit)
      from  812f2714c2908e5b427a8e37032ddcd46fb08297 (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 5184743db419caa1dca30b2d15e3b9d1cdb0c51c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Sep 4 21:10:59 2014 -0400

    Remove name and description columns on jobs table introduced accidentally
    (refs #3036).  Fixed workbench so tests pass.

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index fce7758..1e06b0a 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -213,13 +213,14 @@ class ProjectsController < ApplicationController
         objects_and_names << [object, @name_link_for[object.uuid]]
       elsif object.respond_to? :name
         objects_and_names << [object, object]
-      elsif not Collection.attribute_info.include?(:name)
+      else
         objects_and_names << [object,
                                Link.new(owner_uuid: @object.uuid,
                                         tail_uuid: @object.uuid,
                                         head_uuid: object.uuid,
                                         link_class: "name",
                                         name: "")]
+
       end
     end
     objects_and_names
diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index 13f9f86..8fb3416 100644
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -428,9 +428,7 @@ CREATE TABLE jobs (
     nondeterministic boolean,
     repository character varying(255),
     supplied_script_version character varying(255),
-    docker_image_locator character varying(255),
-    name character varying(255),
-    description text
+    docker_image_locator character varying(255)
 );
 
 

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


hooks/post-receive
--