[ARVADOS] updated: f2f4727cf8a91e363c2a1c85e98fcdd6419abdb5

git at public.curoverse.com git at public.curoverse.com
Tue Aug 4 16:20:11 EDT 2015


Summary of changes:
 .../app/controllers/actions_controller.rb          |  10 +
 apps/workbench/app/controllers/users_controller.rb |  23 +-
 apps/workbench/app/views/layouts/body.html.erb     |  36 +-
 .../notifications/_ssh_key_notification.html.erb   |   5 +-
 ...rent_token.html.erb => _current_token.html.erb} |   5 +-
 .../app/views/users/_manage_account.html.erb       |   8 +-
 ...epositories.html.erb => _repositories.html.erb} |   6 +-
 ...manage_ssh_keys.html.erb => _ssh_keys.html.erb} |   9 +-
 ...achines.html.erb => _virtual_machines.html.erb} |  14 +-
 .../app/views/users/current_token.html.erb         |   1 +
 .../app/views/users/repositories.html.erb          |   2 +
 apps/workbench/app/views/users/ssh_keys.html.erb   |   2 +
 .../app/views/users/virtual_machines.html.erb      |   1 +
 apps/workbench/config/routes.rb                    |   6 +-
 .../test/controllers/actions_controller_test.rb    |  39 ++
 .../test/controllers/projects_controller_test.rb   |  10 +
 .../test/controllers/users_controller_test.rb      |   4 +-
 .../test/integration/application_layout_test.rb    |  14 +-
 .../test/integration/user_manage_account_test.rb   |  73 +++-
 .../test/integration/user_profile_test.rb          |   5 +-
 doc/install/install-api-server.html.textile.liquid | 141 ++++--
 .../install-compute-node.html.textile.liquid       |  20 +-
 .../install-crunch-dispatch.html.textile.liquid    |   4 +
 doc/install/install-sso.html.textile.liquid        |  79 +++-
 .../install-workbench-app.html.textile.liquid      |  23 +-
 sdk/cli/bin/crunch-job                             |  13 +-
 services/api/config/application.default.yml        | 486 +++++++++++----------
 services/api/config/application.yml.example        |  31 +-
 .../{database.yml.sample => database.yml.example}  |   0
 .../initializers/hardcoded_api_tokens.rb.example   |   3 -
 services/api/script/crunch-dispatch.rb             |   6 +
 services/api/test/fixtures/users.yml               |   1 +
 services/datamanager/datamanager.go                |  44 +-
 services/datamanager/keep/keep.go                  |  84 +++-
 services/datamanager/keep/keep_test.go             |  81 ++++
 services/datamanager/summary/pull_list.go          |   6 +-
 services/datamanager/summary/pull_list_test.go     |  81 ++--
 services/datamanager/summary/trash_list.go         |  60 +++
 services/datamanager/summary/trash_list_test.go    |  76 ++++
 services/keepstore/trash_worker.go                 |   8 +-
 40 files changed, 1075 insertions(+), 445 deletions(-)
 rename apps/workbench/app/views/users/{_manage_current_token.html.erb => _current_token.html.erb} (69%)
 rename apps/workbench/app/views/users/{_manage_repositories.html.erb => _repositories.html.erb} (83%)
 rename apps/workbench/app/views/users/{_manage_ssh_keys.html.erb => _ssh_keys.html.erb} (91%)
 rename apps/workbench/app/views/users/{_manage_virtual_machines.html.erb => _virtual_machines.html.erb} (92%)
 create mode 100644 apps/workbench/app/views/users/current_token.html.erb
 create mode 100644 apps/workbench/app/views/users/repositories.html.erb
 create mode 100644 apps/workbench/app/views/users/ssh_keys.html.erb
 create mode 100644 apps/workbench/app/views/users/virtual_machines.html.erb
 rename services/api/config/{database.yml.sample => database.yml.example} (100%)
 delete mode 100644 services/api/config/initializers/hardcoded_api_tokens.rb.example
 create mode 100644 services/datamanager/keep/keep_test.go
 create mode 100644 services/datamanager/summary/trash_list.go
 create mode 100644 services/datamanager/summary/trash_list_test.go

       via  f2f4727cf8a91e363c2a1c85e98fcdd6419abdb5 (commit)
       via  44184f3bebe52f3d4ea567b8105f3631fcb003fe (commit)
       via  cca0d86de72487988b1a7d657e67143121461a0f (commit)
       via  5b2e3d9c92b34603912872c2e10e13da91268a29 (commit)
       via  e32890977964e1c14169962edeba4f642e4e1091 (commit)
       via  9fcd7e96ad9ed8c7f3a343663a06ee9cbaa15aa9 (commit)
       via  8f93d1332a25d29aa96211920e1b399a1e94482c (commit)
       via  b958c247cba0cc0a9b13dfd4fbc10c1a807b5074 (commit)
       via  5f708f621d43585e59787d86d4e3565e09f9c6b8 (commit)
       via  80abb8a0e679f4dd1a7ac00cd629f854af160de5 (commit)
       via  b3a25028eaf04bf77e1f0665968527a9084a84dc (commit)
       via  15c86f88f1f5124c082e77dedd0b97c5efc93388 (commit)
       via  95135f30f13fe233da5d8713737561f77a97c6b6 (commit)
       via  434be0f7e6420fee1b99e78466ee4a4d734734c1 (commit)
       via  b6f800ae7e474f1ceeb827fc9712296a96514592 (commit)
       via  b5b88cdaefb4f35b877c3279d6556fae7d62afcf (commit)
       via  a812a13a6e9854f37ecebccedeb163b8cbe7130e (commit)
       via  93655055b823716a4e45abc4f35f6ba06920e11b (commit)
       via  d44692dedcf0af87f53653afc27154c38a7b72a5 (commit)
       via  a789f895a5cdbc2a548787f99197f9861521106b (commit)
       via  4d6e05c25c6a5d72afee37f8165b006267b4183d (commit)
       via  41bb13b71c8593134c2b34884249ca862b185e04 (commit)
       via  6988f4d44d2f8f7fc4aa2c381334c44d3133cf31 (commit)
       via  bb58564d632498a394ee75b07d17f41b724ef824 (commit)
       via  71e1b1d62a71ad052487f5e8ecb8f36ae17ca8e1 (commit)
       via  f3504dc2b40eaa4235092b671ce0bece43732904 (commit)
       via  5ef15a740ed578b2c5d3cc4ef28ef38bb1c433af (commit)
       via  a76d71558daa6b623c00c8e262840fc6dd68119f (commit)
       via  e8ba9a0432ab7a304bb4b41eb563443f34cf2d7d (commit)
       via  d2cbbe5a55cec8e6a874ea65acec7bf36c8c0a83 (commit)
       via  8d2aebfd3a0e4814b292659710386f949cafe092 (commit)
       via  60f3ef78fe5dc269b2c06d980cc95cbc4f8fdd84 (commit)
       via  415ecc439212c2a670b1df05c3e8b1a90245243e (commit)
       via  9b3223e5cbcd1eb89193e8421d430025ddf791d1 (commit)
       via  157a17462d308d94c68bcdaa4dab055c0e5ccbe8 (commit)
       via  cda68ba838b2595c631231a08a8e3b3ea03d2c7f (commit)
       via  017d19d31606b8b313c04fffc33d44592ad9644b (commit)
       via  a94ec93d3322320bbf075559c4693da816b815f4 (commit)
       via  fc8a283968b08b152d57a24d2c5711c876a3b379 (commit)
       via  da56d26d09a6b315bdb93aed4473310b939e1bd7 (commit)
       via  6aac88a912ded276ed151501ac3977cfcc78600d (commit)
       via  50419ea603e697dd53690842a07a279577d1ca68 (commit)
       via  91b7b7fd54c4728ac6cf12181efc1fed60157ecb (commit)
       via  f51b562b9def7f6bc17e0cc52b60ffc2641d40b5 (commit)
       via  f63e86a3270836ab5e5f1de31e28b686ff809739 (commit)
       via  7da85b85af2dd9b22186bfd48190de7b68f75837 (commit)
       via  036140f305fc34fdefe0ae393b1011f4c3f840de (commit)
       via  b0b276ff6121aace3c52ee855752df6852120343 (commit)
       via  2578d032288f24988a54ee57708fe71902e4ef92 (commit)
      from  fe7f9a43e42f31c35d879aee3e0ec5f811b19abf (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 f2f4727cf8a91e363c2a1c85e98fcdd6419abdb5
Merge: fe7f9a4 44184f3
Author: radhika <radhika at curoverse.com>
Date:   Tue Aug 4 16:20:04 2015 -0400

    Merge branch 'master' into 6588-documentation


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list