[ARVADOS] updated: 436d545670d3637dcd96b429e538b995ee98a49b
git at public.curoverse.com
git at public.curoverse.com
Tue Jun 3 14:47:00 EDT 2014
Summary of changes:
.../app/controllers/application_controller.rb | 26 +++++
apps/workbench/app/helpers/application_helper.rb | 11 ++-
.../app/models/api_client_authorization.rb | 2 +-
apps/workbench/app/models/arvados_base.rb | 4 +-
apps/workbench/app/models/authorized_key.rb | 4 +-
apps/workbench/app/models/collection.rb | 2 +-
apps/workbench/app/models/job.rb | 2 +-
apps/workbench/app/models/pipeline_instance.rb | 7 +-
apps/workbench/app/models/user.rb | 4 +-
apps/workbench/app/models/virtual_machine.rb | 2 +-
apps/workbench/app/views/collections/show.html.erb | 4 +-
.../app/views/collections/show_file_links.html.erb | 2 +-
sdk/python/arvados/commands/put.py | 20 ++--
sdk/python/test_cmdline.py | 81 ----------------
.../tests/{test_arv-put.py => test_arv_put.py} | 103 +++++++++++++++++++-
.../controllers/arvados/v1/groups_controller.rb | 7 +-
.../controllers/arvados/v1/job_tasks_controller.rb | 1 +
.../arvados/v1/pipeline_instances_controller.rb | 2 +-
.../app/controllers/arvados/v1/users_controller.rb | 2 +
services/api/app/mailers/admin_notifier.rb | 52 +++++-----
services/api/app/models/link.rb | 8 ++
services/api/app/models/pipeline_instance.rb | 71 ++------------
services/api/app/models/user.rb | 10 +-
.../admin_notifier/after_create_user.text.erb | 7 --
.../admin_notifier/new_inactive_user.text.erb | 13 +++
.../api/app/views/admin_notifier/new_user.text.erb | 16 ++++
.../app/views/pipeline_instances/index.html.erb | 4 +-
services/api/config/application.default.yml | 2 +
.../20140601022548_remove_name_from_collections.rb | 9 ++
...e_active_and_success_from_pipeline_instances.rb | 42 +++++++++
services/api/db/schema.rb | 9 +-
.../test/integration/serialized_encoding_test.rb | 62 ++++++++----
services/api/test/unit/pipeline_instance_test.rb | 43 +--------
services/api/test/unit/user_test.rb | 105 ++++++++++++++++-----
services/fuse/tests/test_mount.py | 7 +-
35 files changed, 444 insertions(+), 302 deletions(-)
delete mode 100644 sdk/python/test_cmdline.py
rename sdk/python/tests/{test_arv-put.py => test_arv_put.py} (78%)
delete mode 100644 services/api/app/views/admin_notifier/after_create_user.text.erb
create mode 100644 services/api/app/views/admin_notifier/new_inactive_user.text.erb
create mode 100644 services/api/app/views/admin_notifier/new_user.text.erb
create mode 100644 services/api/db/migrate/20140601022548_remove_name_from_collections.rb
create mode 100644 services/api/db/migrate/20140602143352_remove_active_and_success_from_pipeline_instances.rb
via 436d545670d3637dcd96b429e538b995ee98a49b (commit)
via ab2550bca241736c162a435d62fc3ccb4ac5dc8e (commit)
via debfa4b65640388800daf3ac90263454a6fe2f8d (commit)
via 96e6e2890330e18af48d460e54077257bd82161e (commit)
via 656769b7b36b38c564f7da64b275d8831d7a442e (commit)
via abc22e2b430a57787adaf9b665cff1214b0d87fc (commit)
via 0558601e48e0440887ae597a64c314676bb1e138 (commit)
via 902ff4f1b2c139d7637abeabb610e7e0d0858c0c (commit)
via f6235f6bbe13b61b298d07bedb75ba645d69ed15 (commit)
via aa58b06d72a858fd63e091622a5bd8b3a9287e72 (commit)
via cce25fdb29b36ffa3348546da36cbd4d8bbfe4fc (commit)
via 16263c93ec077d2d54b012b9916cc9a421888317 (commit)
via afd7a019bbeed1f194d6f4fbd2e190eae42ddb86 (commit)
via 65be441066ac47f556b3a19872536b42b09c5e22 (commit)
via c950192e08bcfc6e84432359a7128b73b52e8a58 (commit)
via 8997d50ab1d335120af5965957c4cca9fb2a3b16 (commit)
via 6029fb64fd6372c577f9f143e6f3dcaded127ac3 (commit)
via c88315d6435332f5dababac62ff4d72dadde7c67 (commit)
via e1ae50d3e62499eaa0938f27cea3e4ff8ba116a3 (commit)
via cff73e6feea770c80d9a63168de2be7cb6663a4d (commit)
via 95709eedf2452d3ceddeeb02d24b823a552300cf (commit)
via a6c0e01403377311a12f6d9ae587d92dbc00e1fd (commit)
via 4609a76d9b84e0f63233cdf6dcbef376b1686b69 (commit)
via 0c1c7fa2cba96aae542db0e6b6991c71d5ff578a (commit)
via 80f24dbef6515f100a5358c3e94fddd4ff7d97c7 (commit)
via e9fc734bb270a5648c923ed0419ff745e283419c (commit)
via e1868aea69f51b3fb3d281a0dcca66b9de239cfa (commit)
via c811cb98bce53f775a865a04ea0f01635dbe75f3 (commit)
via 9706665da1dd8f3ccb8129933f02f4b7e21bc878 (commit)
via e2a7fe50d3b6e98b7f549c78c4f91dbe4066ddbb (commit)
via ebb166d65eb37f89edeccfc5be97014f3f2a73e2 (commit)
via c4175f65bdd100d38bd0e1d212f72c733299ed36 (commit)
via 844b65fa97d14fddd7f7b702328a31476932fe10 (commit)
via 1eee45ce0bbae9e7d04a9382469d2c48fb0cfd3e (commit)
via 89851a28f3bd8dc05bb8efcab86fa42dda7e7fd2 (commit)
via 6e0751ce5ea7332fc87e7836c24b6ccb49c399dc (commit)
via 40cbd508756d5ec3935489fc67f5ada7423dc17f (commit)
via 83a8512fad199107ff54762658a55176d479a5bb (commit)
from 22e76f53dad163dd1d6703d792d94527d70bb334 (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 436d545670d3637dcd96b429e538b995ee98a49b
Merge: 22e76f5 ab2550b
Author: radhika <radhika at curoverse.com>
Date: Tue Jun 3 14:46:45 2014 -0400
Merge branch 'master' into 2895-no-more-redis
diff --cc services/api/app/controllers/arvados/v1/users_controller.rb
index 781bd88,7311deb..a671809
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@@ -1,8 -1,10 +1,10 @@@
class Arvados::V1::UsersController < ApplicationController
+ accept_attribute_as_json :prefs, Hash
+
skip_before_filter :find_object_by_uuid, only:
- [:activate, :event_stream, :current, :system, :setup]
+ [:activate, :current, :system, :setup]
skip_before_filter :render_404_if_no_object, only:
- [:activate, :event_stream, :current, :system, :setup]
+ [:activate, :current, :system, :setup]
before_filter :admin_required, only: [:setup, :unsetup]
def current
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list