[ARVADOS] updated: 44184f3bebe52f3d4ea567b8105f3631fcb003fe

git at public.curoverse.com git at public.curoverse.com
Tue Aug 4 16:01:52 EDT 2015


Summary of changes:
 apps/workbench/app/controllers/users_controller.rb | 23 ++++---
 apps/workbench/app/views/layouts/body.html.erb     | 34 ++++++++--
 .../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/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 +-
 services/api/test/fixtures/users.yml               |  1 +
 18 files changed, 156 insertions(+), 57 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

       via  44184f3bebe52f3d4ea567b8105f3631fcb003fe (commit)
       via  cca0d86de72487988b1a7d657e67143121461a0f (commit)
       via  8f93d1332a25d29aa96211920e1b399a1e94482c (commit)
       via  a789f895a5cdbc2a548787f99197f9861521106b (commit)
       via  41bb13b71c8593134c2b34884249ca862b185e04 (commit)
       via  cda68ba838b2595c631231a08a8e3b3ea03d2c7f (commit)
       via  017d19d31606b8b313c04fffc33d44592ad9644b (commit)
       via  a94ec93d3322320bbf075559c4693da816b815f4 (commit)
       via  fc8a283968b08b152d57a24d2c5711c876a3b379 (commit)
       via  da56d26d09a6b315bdb93aed4473310b939e1bd7 (commit)
       via  6aac88a912ded276ed151501ac3977cfcc78600d (commit)
      from  5b2e3d9c92b34603912872c2e10e13da91268a29 (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 44184f3bebe52f3d4ea567b8105f3631fcb003fe
Merge: 5b2e3d9 cca0d86
Author: Manoj <jonam33 at gmail.com>
Date:   Tue Aug 4 16:01:08 2015 -0400

    refs #6588
    Merge branch '6588-split-manage-account'


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list