[ARVADOS] updated: a6c0c9dccbe036132c110817d69c08b757aab5fa

git at public.curoverse.com git at public.curoverse.com
Tue Apr 8 14:11:31 EDT 2014


Summary of changes:
 apps/workbench/Gemfile                             |    3 +-
 apps/workbench/Gemfile.lock                        |    4 +
 apps/workbench/README.textile                      |   14 ++
 .../app/assets/javascripts/application.js          |    1 +
 apps/workbench/app/controllers/users_controller.rb |   92 +++++++++-
 apps/workbench/app/models/user.rb                  |    4 +
 .../workbench/app/views/application/index.html.erb |   19 ++-
 .../app/views/layouts/application.html.erb         |    1 +
 .../app/views/users/_setup_popup.html.erb          |   69 +++++++
 .../workbench/app/views/users/_show_admin.html.erb |   10 +
 apps/workbench/app/views/users/setup.js.erb        |    2 +
 apps/workbench/app/views/users/setup_popup.js.erb  |   44 +++++
 apps/workbench/config/application.default.yml      |    1 +
 apps/workbench/config/routes.rb                    |    3 +
 apps/workbench/test/integration/users_test.rb      |  193 ++++++++++++++++++++
 .../app/controllers/arvados/v1/users_controller.rb |    3 +-
 services/api/app/models/user.rb                    |   81 ++++++---
 .../functional/arvados/v1/users_controller_test.rb |   26 ++-
 18 files changed, 530 insertions(+), 40 deletions(-)
 create mode 100644 apps/workbench/app/views/users/_setup_popup.html.erb
 create mode 100644 apps/workbench/app/views/users/setup.js.erb
 create mode 100644 apps/workbench/app/views/users/setup_popup.js.erb
 create mode 100644 apps/workbench/test/integration/users_test.rb

       via  a6c0c9dccbe036132c110817d69c08b757aab5fa (commit)
       via  7488683807205fdfebd3c52e6ba50a0879ef1da7 (commit)
       via  351718c4524ede8442f1cc078d61ced8839440c5 (commit)
       via  0c632a2429105322f793809f1ab5bb158050ed56 (commit)
       via  da1c3891473b02f891eaa0af3d9d799ec6b6ed54 (commit)
       via  6783336d968c8e47ad63e929086aa704299bb403 (commit)
       via  3dd13d1a0643fdcc9e4f391b74b2496ca2ebbc7c (commit)
       via  dcbdaf47dd1486f58893413c07a9cb5c6d180923 (commit)
       via  c7b2768cd590b633fe4154dedec2d8ad387a9d9b (commit)
       via  a0d41ce990cf0a6fcd516a6a10f662a85258238c (commit)
       via  19d60097652447fe7c71ec78f5c8d52a7002b3b8 (commit)
       via  4c179135909d37a6cd9722af909785393d9e117d (commit)
       via  64d449da29bbbe6bce2b54a2ed67eb4cb44243c9 (commit)
       via  c7f17227456c27d71bca83895c84bc83fb3b4ec5 (commit)
       via  2908852ef9d52b12eb715474c5f31e35f7c44b18 (commit)
       via  11a9f64426c1fc50529e694fead97f81e6eb4457 (commit)
       via  e9339eb1983e33798270f61f57d90cde4b656bd8 (commit)
       via  8ea149362539b3d50e14a7fbd8831c7cbf347446 (commit)
       via  847b4a5d6e179dde49295a7118962e764d63e544 (commit)
       via  1d6d51202a936a28eee2384ceaa7c725813a2b03 (commit)
       via  d0dc31b9feb56c026f7c7ae0d46e63434b46742f (commit)
       via  a6724f72c5a93edf2b8a456783a474024743f1ff (commit)
       via  cbdb5dc18ccbd8cd2cdc4ebeaace82aa33b36f70 (commit)
       via  1418580063cbe02ab3376adb27928c5325ba10b3 (commit)
       via  a3212e71057712af58a7d2b849d69915b4fd79b1 (commit)
       via  59b0a3a8e5209ef85967a93c500167b7cf882757 (commit)
       via  9349484f1e607064cf96fa7f7212979d30e58448 (commit)
       via  5a7b7aa6a6a11b5e0a397d01a6fe527169ed5f15 (commit)
       via  9f87668ecf0768f83b95253d8888481b1d8ff95e (commit)
       via  4882cd9ebd6311c4f84d8efff21561b1a229e244 (commit)
       via  a992c11d76c013d42470a5142714d68e918bccfa (commit)
       via  1697fcdd746eb5a30127275e533c3d799aa9f681 (commit)
       via  921ec0ddab4c949659d54490204acdd431986450 (commit)
       via  c6cb3423e9ca2b421bda3bb97c1448dcde19df97 (commit)
       via  3ca0861ae65a9c61f0db226bbe9f70cfc0a4ec7b (commit)
       via  fe0d9b8e3a46c610deb95b9a8b501e8c2aad9f54 (commit)
       via  cb19d007add188f2c83a082c419ee0b523fb664b (commit)
       via  a15ff495c8c576378f55f58fe22ce9f3c49121e8 (commit)
      from  4eba2cb5d7d6a5d76b9ce4d3f535a1de911400cd (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 a6c0c9dccbe036132c110817d69c08b757aab5fa
Merge: 4eba2cb 7488683
Author: Tim Pierce <twp at curoverse.com>
Date:   Tue Apr 8 14:11:24 2014 -0400

    Merge branch 'master' into 2449-keep-write-blocks


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list