[ARVADOS] updated: aab0fe9d849952d926a252fac1fedd7e643f5a00

git at public.curoverse.com git at public.curoverse.com
Thu Apr 17 11:18:00 EDT 2014


Summary of changes:
 apps/workbench/app/helpers/application_helper.rb   |   39 +++++++++++++++++++-
 apps/workbench/app/helpers/collections_helper.rb   |   33 +++++++++++++++++
 .../views/application/_arvados_attr_value.html.erb |    2 +-
 .../app/views/collections/_show_files.html.erb     |   25 +++++++++----
 .../pipeline_instances/_show_components.html.erb   |    2 +-
 5 files changed, 89 insertions(+), 12 deletions(-)

       via  aab0fe9d849952d926a252fac1fedd7e643f5a00 (commit)
       via  21e96241f20ddec17d6d122a489902204a2a0781 (commit)
       via  30b02581c938c05b804f7510a1fc8e850830b9cd (commit)
       via  c9f04f87062eec4097dc74dcc79b364fb905851c (commit)
       via  1b7d5cef1b7890994826a44102b589124a2a2340 (commit)
       via  7a98271d94163cdc4afa5bfcf275db353bc062d2 (commit)
       via  6d59f29ba37c608e4b01b27a2fa78bc065fdc2a6 (commit)
       via  b6ee74d757dc98b558dfdb420be46d0b954dc446 (commit)
       via  f7bec4b4fde3c9cdec0823719f4d0806ee27021a (commit)
       via  7b3f8ace626fa8fe401742fd9b2a616d651d6c2b (commit)
       via  0d4ddf36fb71ecf7cc981c67c07584a3a7fcac46 (commit)
       via  5f3de04d46dd4aeec45731b4e5c479c689eee7b6 (commit)
      from  4d629923847cac25ed6bdaf5c96e1f33a1a8e0c8 (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 aab0fe9d849952d926a252fac1fedd7e643f5a00
Merge: 21e9624 4d62992
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Apr 17 11:17:47 2014 -0400

    Merge branch 'master' of git.clinicalfuture.com:arvados
    
    Conflicts:
    	apps/workbench/app/helpers/application_helper.rb

diff --cc apps/workbench/app/helpers/application_helper.rb
index ec10a52,953b666..7231ff8
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@@ -272,8 -224,8 +259,8 @@@ module ApplicationHelpe
      }.merge(htmloptions)
  
      lt += raw("\n<script>")
 -    
 +
-     if items and items.length > 0
+     if items.any?
        lt += raw("add_form_selection_sources(#{items.to_json});\n")
      end
  

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list