[ARVADOS] updated: 4bd39bd3c06c162c0fb35be17ef6ccd8a85b56b8

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/application.js          |   36 ++++++++
 .../app/assets/stylesheets/application.css.scss    |   15 +++
 .../app/controllers/collections_controller.rb      |    2 +-
 apps/workbench/app/helpers/provenance_helper.rb    |   95 ++++++++++----------
 .../app/views/collections/_show_recent.html.erb    |    4 +-
 apps/workbench/app/views/collections/index.js.erb  |    1 +
 .../app/views/layouts/application.html.erb         |   30 ++++---
 .../app/views/user_agreements/index.html.erb       |    2 +-
 sdk/cli/bin/arv-run-pipeline-instance              |    6 +-
 sdk/cli/bin/crunch-job                             |    1 +
 sdk/python/arvados/keep.py                         |    2 +-
 sdk/python/arvados/util.py                         |   32 ++++---
 .../arvados/v1/collections_controller.rb           |   33 ++++---
 .../app/controllers/user_sessions_controller.rb    |    2 +-
 services/api/app/models/arvados_model.rb           |   19 ++++
 services/api/app/models/collection.rb              |   26 +++++-
 services/api/app/models/job.rb                     |    4 +
 services/api/app/models/user.rb                    |    6 +-
 services/api/test/fixtures/jobs.yml                |    1 +
 .../arvados/v1/collections_controller_test.rb      |   18 +++-
 .../functional/arvados/v1/jobs_controller_test.rb  |   32 +++++++
 21 files changed, 258 insertions(+), 109 deletions(-)

       via  4bd39bd3c06c162c0fb35be17ef6ccd8a85b56b8 (commit)
       via  10e10f0f796cacd223bb781837c98598680b722c (commit)
       via  7e4183261af428dfc63489f9be6cc2417348e021 (commit)
       via  b007a36da0d5c3a4cb5fcee340a61e2a515ac37b (commit)
       via  c84af5984c87bbcbf345da68243ba01da5e483dc (commit)
       via  25a646aef93c601334e9d1f676d7ba04e5868b0b (commit)
       via  4290ebf2130f74b1a7448f073b0bfb2394e4e8bf (commit)
       via  df660bb1bd636ac09889f74604390a78f115bfe7 (commit)
       via  3d3f6b1262bd416ca1c7a2deb6ac87099f662edd (commit)
       via  ccf75b956a181b3867b0a3ce819607033a6775d0 (commit)
       via  d401c16c6043e56306d4c4ec3904f2a1ba9de7b6 (commit)
       via  ca435af8ada685bccd2a844b48582450c5c29f86 (commit)
       via  d3384897f0486aebd2941210ee16c5a4d52de21c (commit)
       via  7ee2fdbf6710397a608d548b210b89a68ea8f314 (commit)
       via  bfc0652a9bbc650688a393596355392ead16dbbb (commit)
       via  e1f7ea951ed4a661c68ce0168650f44d41240a06 (commit)
       via  b60db85375812f6cedfdb4e153de4ed5735f4854 (commit)
       via  a765f863edb242574de82486fae365c4a6687f41 (commit)
       via  bf74325bd7f166a7fe1c02aca47a03bc7443ac8b (commit)
       via  16d4aaa4520d2179e6f3f6af9173470463e13714 (commit)
       via  8d1ee366554c12b5746f39b34a46055ed431a7ef (commit)
       via  701074a294c18ad56b7f17cfc488a2cbc25816d5 (commit)
       via  b436539142666c2553a74363fbf7e34fefc9912b (commit)
       via  876c8e2ada7a9b8d1baf6fc11bd579e6bfad7789 (commit)
       via  c41beef3142e9c3e15385b2ad76c2a0088ca6a20 (commit)
      from  21cdd54adbe64f5013f1081d6e2f0ba5987fb56d (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 4bd39bd3c06c162c0fb35be17ef6ccd8a85b56b8
Merge: 21cdd54 10e10f0
Author: Tim Pierce <twp at curoverse.com>
Date:   Tue Feb 18 16:25:26 2014 -0500

    Merge branch 'master' into 2013-search-all-the-things
    
    Conflicts:
    	services/api/app/models/collection.rb

diff --cc services/api/app/models/collection.rb
index 76bc3a0,f6c8b26..053aed9
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@@ -8,10 -8,10 +8,14 @@@ class Collection < ArvadosMode
      t.add :files
    end
  
+   api_accessible :with_data, extend: :user do |t|
+     t.add :manifest_text
+   end
+ 
 +  def self.searchable?
 +    true
 +  end
 +
    def redundancy_status
      if redundancy_confirmed_as.nil?
        'unconfirmed'

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


hooks/post-receive
--