[ARVADOS] updated: 4008255ff579edf745b50599e0368106dc95acaa
git at public.curoverse.com
git at public.curoverse.com
Tue Feb 4 16:21:42 EST 2014
Summary of changes:
.../app/controllers/collections_controller.rb | 3 +-
.../controllers/pipeline_instances_controller.rb | 36 ++++++++----
.../app/helpers/pipeline_instances_helper.rb | 1 +
apps/workbench/app/helpers/provenance_helper.rb | 20 +++++-
apps/workbench/app/models/collection.rb | 4 +
.../app/views/application/_svg_div.html.erb | 28 ++++++----
.../collections/_show_provenance_graph.html.erb | 7 +-
.../app/views/collections/_show_used_by.html.erb | 11 ++++
.../app/views/pipeline_instances/compare.html.erb | 12 ++++
.../api/app/controllers/application_controller.rb | 10 +++-
.../arvados/v1/collections_controller.rb | 59 ++++++++++++++++++++
.../arvados/v1/repositories_controller.rb | 2 +
services/api/config/routes.rb | 1 +
.../arvados/v1/repositories_controller_test.rb | 11 ++++
14 files changed, 173 insertions(+), 32 deletions(-)
create mode 100644 apps/workbench/app/views/collections/_show_used_by.html.erb
via 4008255ff579edf745b50599e0368106dc95acaa (commit)
via 15bc31fe70042ac6235d9984f8a116b8640b92c4 (commit)
via 7f2449727f36a2687f22be1b3587674a2eb8c7ed (commit)
via 1ad669e1a65f24363d8f6b45798d96e6592e2bb7 (commit)
via e5d1f2f918be2c6a59ac4085276342cc4533fe2a (commit)
via 0c0bdf1c00e1f0a50bc5977f171ae1ac720c79bb (commit)
via 345960e59c01e6f2071ee65a44fbc62288b278dc (commit)
via fdcb867b94ad0d44040c54bbe8fb4f07351c281c (commit)
via 9e3bb9b984ff700fc3455f87437a8f1ac5841f0e (commit)
via b2a75b1d0eab457047564a6901016c27a08fa36d (commit)
from 1bdb21c0368faa53ec49a7706fba51dcf6416cfd (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 4008255ff579edf745b50599e0368106dc95acaa
Merge: 1bdb21c 15bc31f
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Feb 4 13:20:09 2014 -0800
Merge branch 'master' into 1979-workbench-ui
Conflicts:
apps/workbench/app/views/application/index.html.erb
apps/workbench/app/views/application/show.html.erb
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list