[ARVADOS] updated: 7ccba0ea6cb9916a1bad55f13cc45029f0bc37bd

git at public.curoverse.com git at public.curoverse.com
Tue Jun 10 16:10:47 EDT 2014


Summary of changes:
 apps/workbench/app/assets/images/ajax-loader.gif   | Bin 0 -> 3208 bytes
 .../app/assets/javascripts/application.js          |  12 +-
 apps/workbench/app/assets/javascripts/event_log.js |  25 ++-
 .../app/assets/javascripts/pipeline_instances.js   |  15 +-
 .../app/controllers/application_controller.rb      |  58 +++++-
 .../app/controllers/collections_controller.rb      |  10 +-
 .../workbench/app/controllers/groups_controller.rb |   1 +
 apps/workbench/app/controllers/jobs_controller.rb  |   4 +
 .../controllers/pipeline_instances_controller.rb   |  26 ++-
 .../app/controllers/sessions_controller.rb         |   3 +
 apps/workbench/app/helpers/application_helper.rb   |   2 +-
 apps/workbench/app/models/arvados_api_client.rb    |   4 +
 .../app/views/application/_content.html.erb        |  75 +++++--
 apps/workbench/app/views/collections/show.html.erb |   7 +-
 .../workbench/app/views/jobs/_show_status.html.erb |   2 +-
 .../app/views/layouts/application.html.erb         |   4 +-
 .../pipeline_instances/_show_components.html.erb   |   3 -
 .../workbench/app/views/users/_show_admin.html.erb |   2 -
 apps/workbench/test/integration/users_test.rb      |   3 -
 sdk/cli/bin/arv-run-pipeline-instance              |  18 +-
 sdk/go/src/arvados.org/keepclient/keepclient.go    |  42 +---
 .../src/arvados.org/keepclient/keepclient_test.go  |  76 +++----
 sdk/go/src/arvados.org/keepclient/support.go       |  51 +----
 sdk/go/src/arvados.org/sdk/sdk.go                  | 232 +++++++++++++++++++++
 sdk/go/src/arvados.org/sdk/sdk_test.go             |  92 ++++++++
 .../app/controllers/arvados/v1/jobs_controller.rb  |   2 +-
 services/api/script/crunch-dispatch.rb             |  97 +++++++--
 .../keep/src/arvados.org/keepproxy/keepproxy.go    |  32 +--
 .../src/arvados.org/keepproxy/keepproxy_test.go    |   9 +-
 29 files changed, 678 insertions(+), 229 deletions(-)
 create mode 100644 apps/workbench/app/assets/images/ajax-loader.gif
 create mode 100644 sdk/go/src/arvados.org/sdk/sdk.go
 create mode 100644 sdk/go/src/arvados.org/sdk/sdk_test.go

       via  7ccba0ea6cb9916a1bad55f13cc45029f0bc37bd (commit)
       via  eaa312ea7c35e35c64dbef9624be1d9c7df034ef (commit)
       via  70148c4918a95ee9a49a18bf5789801d02e8ef5e (commit)
       via  f0a048b4b9792550f59ee23b13c09cca21681eb4 (commit)
       via  d161e2280a03b4a1c9675f5ed1946310a9942acd (commit)
       via  23fd8b137488baeb3138e2127294e8e14917d3ed (commit)
       via  82c4697bf24b10f3fb66d303ae73499095b5742a (commit)
       via  505f5c37bb9fe1fe93f8bdbd2d2072e783832f20 (commit)
       via  541ce54ba2c7c8f9783da04f947ccf055b72ae2c (commit)
       via  35db7f5c7f1d62f996550f51fc4f0dd4f77627fb (commit)
       via  799e968ef79906bcd8b491f1ad99572b1cc21ccc (commit)
       via  a314e176f65f97059b43f50a84814f4fe5e5d73d (commit)
       via  f883adf66c3da731904d5c25c779a13416ce9193 (commit)
       via  2bd11a587ca12d8921042d86df4d095c79243dbc (commit)
       via  d687fed365e545dea1c9283e917e05bb2a4ed07c (commit)
       via  92594178fbe4155f3122a1b0a52b5b3da995aabb (commit)
       via  4d73cd3503ca20ec4d1f8198617fea3bf481a48e (commit)
       via  40e48b2aac96a71c8ae3c2265f43b882f415e63d (commit)
       via  90f3d66faa1a87b0b230a8a9a7a9879e66f29cd0 (commit)
       via  497ea8e6fd12ce91cad108af78df5e3802a79d69 (commit)
       via  7e865395a4ccf9f17b904c3700064328d52db121 (commit)
       via  9a48ecf1c92b9b8f513a5e621a0e263ccde076e4 (commit)
       via  468a80200c8ef3e4a56700714e9af537d87a20bc (commit)
       via  67578498c5de67fe2e821a3d91c1d2b7294df579 (commit)
       via  ef3e10bdf2324f3c9e6427b3fd085e6b05e3877c (commit)
       via  879e1f31b0165c6abaa35a023ff66400757bb44b (commit)
       via  987b88a5441387ff91877464def7933064815b59 (commit)
       via  626db8559ebaa13df19dafe9bb03b1bd484b762c (commit)
       via  32f6ee6884704bde04878f5cbc176a7a819a50e8 (commit)
       via  38a55a1518838ea68cba69b4e8d1c27d2128328d (commit)
       via  c4cfb4caca122ba09ab9153453650c308457e675 (commit)
      from  3692a4ac4d8f76d2e704af5e504652650b4a00cc (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 7ccba0ea6cb9916a1bad55f13cc45029f0bc37bd
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 10 16:02:02 2014 -0400

    2871: add andand to prevent error

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 43c96b5..426a825 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -92,7 +92,7 @@ module ApplicationHelper
               if resource_class.name == 'Collection'
                 link_name = collections_for_object(link_uuid).andand.first.andand.friendly_link_name
               else
-                link_name = object_for_dataclass(resource_class, link_uuid).friendly_link_name
+                link_name = object_for_dataclass(resource_class, link_uuid).andand.friendly_link_name
               end
             rescue RuntimeError
               # If that lookup failed, the link will too. So don't make one.

commit eaa312ea7c35e35c64dbef9624be1d9c7df034ef
Merge: 3692a4a 70148c4
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 10 15:56:07 2014 -0400

    Merge branch 'master' into 2871-preload-objects


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list