[ARVADOS] updated: 9036e4876fa3710b12a1dfb465652c04b9a73901

git at public.curoverse.com git at public.curoverse.com
Wed Aug 5 13:43:31 EDT 2015


Summary of changes:
 apps/workbench/app/controllers/users_controller.rb |  6 ------
 apps/workbench/app/views/layouts/body.html.erb     |  8 +-------
 .../app/views/users/_manage_account.html.erb       | 22 ----------------------
 .../app/views/users/manage_account.html.erb        |  1 -
 apps/workbench/config/routes.rb                    |  1 -
 .../test/integration/application_layout_test.rb    |  2 --
 ..._account_test.rb => user_settings_menu_test.rb} | 19 +++++++++----------
 .../views/user_notifier/account_is_setup.text.erb  |  4 ++--
 .../functional/arvados/v1/users_controller_test.rb |  3 +--
 9 files changed, 13 insertions(+), 53 deletions(-)
 delete mode 100644 apps/workbench/app/views/users/_manage_account.html.erb
 delete mode 100644 apps/workbench/app/views/users/manage_account.html.erb
 rename apps/workbench/test/integration/{user_manage_account_test.rb => user_settings_menu_test.rb} (94%)

       via  9036e4876fa3710b12a1dfb465652c04b9a73901 (commit)
       via  e76165d4c3b0cb5929bfec08f36a95ecd80cd564 (commit)
       via  48dd255814cfc90a095132b6f621af13430267e0 (commit)
       via  baccfce65b0c997202c22e36a2ebfc455eff0334 (commit)
       via  bdabb9aa520b598107e319e51638f899f136aff5 (commit)
       via  44d4d43331979c87cee5df9ff952fd80a6e9c5f8 (commit)
       via  89fccf123374c67e738381ea840e3535b2d1074f (commit)
      from  f097af1ebfdb1ff849c1d5be4bda5b098871b877 (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 9036e4876fa3710b12a1dfb465652c04b9a73901
Merge: f097af1 e76165d
Author: Manoj <jonam33 at gmail.com>
Date:   Wed Aug 5 13:42:37 2015 -0400

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


commit e76165d4c3b0cb5929bfec08f36a95ecd80cd564
Merge: 48dd255 f097af1
Author: Manoj <jonam33 at gmail.com>
Date:   Wed Aug 5 13:42:12 2015 -0400

    Merge branch 'master' into 6588-split-manage-account


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list