[ARVADOS] updated: 402461a12dbff7d0ec00c8446b925b021aabc2ed

git at public.curoverse.com git at public.curoverse.com
Wed Mar 26 13:16:52 EDT 2014


Summary of changes:
 apps/workbench/README.textile                      |    2 +
 .../app/controllers/application_controller.rb      |    3 +-
 apps/workbench/app/controllers/users_controller.rb |   63 ++-
 apps/workbench/app/helpers/application_helper.rb   |   14 +-
 apps/workbench/app/models/arvados_base.rb          |    4 +
 apps/workbench/app/models/arvados_resource_list.rb |    7 +
 .../app/views/layouts/application.html.erb         |    4 +-
 .../app/views/users/_show_activity.html.erb        |    4 +
 apps/workbench/app/views/users/activity.html.erb   |   72 +++
 apps/workbench/config/routes.rb                    |    1 +
 apps/workbench/doc/README_FOR_APP                  |    2 -
 apps/workbench/lib/tasks/config_check.rake         |   13 +-
 .../integration/api_client_authorizations_test.rb  |   11 -
 apps/workbench/test/integration/smoke_test.rb      |   39 ++
 apps/workbench/test/integration_helper.rb          |   15 +-
 doc/README                                         |   31 -
 doc/README.textile                                 |   52 ++
 .../tutorial-new-pipeline.html.textile.liquid      |    1 -
 sdk/cli/bin/arv                                    |   21 +-
 sdk/cli/bin/crunch-job                             |    2 +-
 .../api/app/controllers/application_controller.rb  |    2 +-
 .../controllers/arvados/v1/schema_controller.rb    |   23 +-
 .../app/controllers/arvados/v1/users_controller.rb |   49 ++-
 services/api/app/models/user.rb                    |  152 +++++
 .../api/config/environments/development.rb.example |   39 --
 .../api/config/environments/production.rb.example  |   42 --
 services/api/config/environments/test.rb.example   |   40 --
 services/api/config/routes.rb                      |    4 +-
 services/api/lib/tasks/config_check.rake           |   13 +-
 services/api/script/setup-new-user.rb              |   66 ++
 .../arvados/v1/collections_controller_test.rb      |   22 +
 .../arvados/v1/schema_controller_test.rb           |    2 +-
 .../functional/arvados/v1/users_controller_test.rb |  645 ++++++++++++++++++++
 .../api/test/integration/collections_api_test.rb   |   12 +
 services/api/test/unit/user_test.rb                |  280 +++++++++-
 35 files changed, 1532 insertions(+), 220 deletions(-)
 create mode 100644 apps/workbench/app/views/users/_show_activity.html.erb
 create mode 100644 apps/workbench/app/views/users/activity.html.erb
 delete mode 100644 apps/workbench/doc/README_FOR_APP
 delete mode 100644 apps/workbench/test/integration/api_client_authorizations_test.rb
 create mode 100644 apps/workbench/test/integration/smoke_test.rb
 delete mode 100644 doc/README
 create mode 100644 doc/README.textile
 create mode 100755 services/api/script/setup-new-user.rb

       via  402461a12dbff7d0ec00c8446b925b021aabc2ed (commit)
       via  df4897f1390e58825dd8afcc053955c6d3894169 (commit)
       via  921c13a95c2d13c94de74601e5bc26e5b0c71c31 (commit)
       via  4e26baca96b4cb9e2145475bf31f18a0ffad2c26 (commit)
       via  e102a3b3100577137def302ecd0f810bc46b808a (commit)
       via  23a65392c4dd88f28cbf94ac451bd1f1d9cd0be4 (commit)
       via  b98ffafdc9e1b5904b200013ebe106959334c0c3 (commit)
       via  51a07a4abf5b21fb983e5df39dc2ea9ae58d0469 (commit)
       via  64cdcaf6b38437c459bce30445e547c274e3f99e (commit)
       via  031ad8460650129f8bed088e801fb0762d4d29b3 (commit)
       via  b65cb64f0d7865266bd8674e681cd0f48fd476c7 (commit)
       via  b9e9a418b7db148352bfc6b9f616c37163f38c32 (commit)
       via  9f5d16ade2d95497ed9610eefd03d76fb15eb747 (commit)
       via  ee21f45e958de5ef39970981ead6416e3790cd1a (commit)
       via  2013479619e9aa838037262564ac4f265f786ad0 (commit)
       via  fad09fd18d6c364f358f3d7c5782b4d0360c68ab (commit)
       via  5991a5bb4a4ccf74b763570941458dfee640f6d1 (commit)
       via  31bb970d362490abc5238e895e04ab41d828e64c (commit)
       via  48b87a694a78f09e8e7c6d05212f1e21aa2423d3 (commit)
       via  de10e681e82e0cb987ffb95109a6c09a13f49944 (commit)
       via  91526e84bf213e08b602fdbd4e7b69a18d401483 (commit)
       via  a248323fdb1bfa315a3dc9af0a2362aa5b0a0f46 (commit)
       via  545b33abf34ebbc74fe16e5e541e82d5a79e8457 (commit)
       via  1d3810b3150d653314437471d7858cdbf76b62c7 (commit)
       via  67a54670123669370bb4e664c7e40c71f7539b5f (commit)
       via  0e560c4a9b3f1d46edcbd3fbc595beffc6efca47 (commit)
       via  8dd84d8f667aa40b9c8ce91d1a9248e1a7218039 (commit)
       via  4baccff09d5f8c48cc3c431365f1e029a8c40bb1 (commit)
       via  87501e7bf8d4f2303cc25a00e93476784911438b (commit)
       via  2bfc24e6eb5cbd51bbb2717cd70b02a25b008ae5 (commit)
       via  fefc1d78df0a65c949099f98062877f93dfbec8a (commit)
       via  3dc88c9d537e6056e544746753f7e7befe55cbff (commit)
       via  968a749a6981074ba2159df70adde92b2e681263 (commit)
       via  dff5bfa5afbdd49bf0003b75583b7120f21b7df7 (commit)
       via  83fa2045a190732f8dd9bed3e5c6071ce66da07f (commit)
       via  8c021e4b54a8179e86dd887e1eb8db9ef4dd9672 (commit)
       via  6a18fc0d6f3f9859e905d4762796d813a157605b (commit)
       via  35e245f09cfc5ace6259a671a1f12fd508750b13 (commit)
       via  6fc29fa2b44072bc9a1cd015282dde30a0ee72c4 (commit)
       via  ee1abbc5a99dc2fa67de7713107ccd5473bd94a5 (commit)
       via  1896a42e2da493b024dce40266a4814883c08003 (commit)
       via  a66dcf3c878be422520771e5bde3791248dba001 (commit)
       via  be04ef9fec4824bd09b290999f2f961379bd2b83 (commit)
       via  46f47b1e941e1471363a5d5480dbe4c68c18703a (commit)
       via  007446e69619bae44193f219b6d9b7fda31bafad (commit)
       via  bf53b14daa894c77ea2b9413e9a574897446a2b7 (commit)
       via  178545086f0752789ca79d212e92f8c45030ead9 (commit)
       via  65a085e1a2812e48a6f4b21d5229430549fb8791 (commit)
       via  2d2e5e107fc258c2d6c864f61cb0b03b901c2088 (commit)
       via  e9a25bfe507179a20c4bb8a994ad394759b5239f (commit)
       via  d51fa3200eef8da2798ab7d29e0e6180d3da71f7 (commit)
       via  eb0fdee4d4fdb516dd57998ae6a34840354e6e77 (commit)
       via  e8167f6b3a83525a07c79e03917bad570a6c5c26 (commit)
       via  71d1a30b467a43ef312fd7e81d795864799415b2 (commit)
       via  994fa8b63a19f2253b6027d64f7ea72c43ea1192 (commit)
       via  3e130a782321de2a0343fcec8a3365442ecde431 (commit)
       via  d65964ad6063b6cd5420004a5cbdc58fe2d0b194 (commit)
       via  c09ec8260b02c4767c82bcb5b346899193329828 (commit)
       via  03aadd3864de6d5687e1e6c71815fafc4ec030af (commit)
       via  6849ec08498a596d0604c2876dcd605ce6c6aaeb (commit)
       via  4ad105bd22c9141e5f88139ad3bf334a52f7a5d1 (commit)
       via  1f5561a43693243ad3b6737dcd1020cbe0cc809f (commit)
       via  00a420599077a5063aba449fe9986a765db6bdb3 (commit)
       via  24e20b5eb6f6e021b7f6789ce6e6b4c5a8c678be (commit)
       via  375c23fa047e5fcd09e71f5c473dbd05cbe14891 (commit)
       via  e5804f99569634967d4affe322a382034d81cfa8 (commit)
       via  23a7957589e03db8576c6547d3204477c2b0e7f3 (commit)
       via  0496ff36445af8eae98914b91869ac52d951148e (commit)
       via  7112a411de36be33f6857aea3bc750a87b139854 (commit)
       via  3e5b4f4602903d00650aa7d57a6934617468dd9f (commit)
       via  1b6d98d5000a0c21a5e06a5195cba70d0c2d4dde (commit)
       via  87f67abc3c73634afbaf7ebad1445c1f234dc5d4 (commit)
       via  240c16d4be50f3cb73d5d573421430efb7ece00f (commit)
       via  4b57d5f64a980777888fa49657d6fe0617514218 (commit)
       via  851f7d9cc9d3f6e4843a8fbd507338b1cc0e9f2c (commit)
       via  107377eaf36cba7130e7bc9f42111147049cbd0b (commit)
       via  9b10524c349d0c28a6dcf33ad0a473c3eb2d2b2f (commit)
       via  dc01c0405fbc4c17e3fc947dd154e1adb915a790 (commit)
       via  5351e44b4947d93c1027c70afde0b2fda150abb2 (commit)
       via  ea812dad57e1e31cfce0167a8b8431aad15bf01a (commit)
       via  af19eb3a35900457a1dcfadee789a9052fb50335 (commit)
       via  7db862a48062c6086ea8a6787149afa7d66b1919 (commit)
       via  ac4facb25d9c5828c247ada1fa7618c5a2e8b2d8 (commit)
       via  dcbb5acc0f9767c6b358e5f5d6055b78290430ab (commit)
       via  daf4ff30727f49ee3606fe8adab3b67f35e00beb (commit)
       via  cf7e30873ef4b92cc8ec099b2bb344391a070e93 (commit)
       via  cbfc8eea7f3fc96f478530c77441b7175a043a17 (commit)
       via  8993f82f9148553603d9d6ce5f638a253f7fce70 (commit)
       via  501db79a2d00dcd79b3cf3757f6a93ef6c1c1696 (commit)
       via  22b6371cb0ff61b9dd19cef581ec1bdaae1b0bd9 (commit)
       via  4127b85f2c1af611bb70d5ab469adac126d0a7a4 (commit)
       via  2d9d106c40b83e9a72d431bdb198ed5b8b13550a (commit)
       via  acf1ba5bb4d987012030de8978cc6930e1bee654 (commit)
       via  fca114122bb204b34414a17e278748ec8e87e136 (commit)
       via  b37cf5e27548d8af4ec355c9a102c9a5734b3306 (commit)
      from  7c04fe3e0e93d22b9c884934dbbd80fed6072ee3 (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 402461a12dbff7d0ec00c8446b925b021aabc2ed
Merge: 7c04fe3 df4897f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Mar 26 13:16:37 2014 -0400

    Merge branch 'master' into 2051-nondeterministic-jobs
    
    Conflicts:
    	doc/README
    	doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid

diff --cc apps/workbench/doc/README_FOR_APP
index fe41f5c,fe41f5c..0000000
deleted file mode 100644,100644
--- a/apps/workbench/doc/README_FOR_APP
+++ /dev/null
diff --cc doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
index a4bad58,d218c3b..132bc9d
--- a/doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
+++ b/doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
@@@ -71,5 -69,5 +71,4 @@@ Now, use @arv pipeline_template create
  </code></pre>
  </notextile>
  
 -Your new pipeline template will appear on the "Workbench %(rarr)→% Compute %(rarr)→% Pipeline templates":http://{{ site.arvados_workbench_host }}/pipeline_templates page.
 -
 +Your new pipeline template will appear on the "Workbench %(rarr)→% Compute %(rarr)→% Pipeline templates":https://{{ site.arvados_workbench_host }}/pipeline_instances page.
- 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list