[ARVADOS] updated: fad046d56740092b1483cb646d2f7c92c544c165

git at public.curoverse.com git at public.curoverse.com
Mon Jul 21 15:07:10 EDT 2014


Summary of changes:
 .../app/assets/javascripts/infinite_scroll.js      |  33 ++++--
 .../app/assets/javascripts/pipeline_instances.js   |   6 +
 .../app/assets/javascripts/select_modal.js         |   3 +
 apps/workbench/app/assets/javascripts/sizing.js    |   1 +
 apps/workbench/app/assets/javascripts/tab_panes.js |  38 +++++++
 .../app/controllers/application_controller.rb      |  15 ++-
 .../app/controllers/projects_controller.rb         |  86 ++++++++++----
 apps/workbench/app/helpers/application_helper.rb   |  61 +++++-----
 apps/workbench/app/models/arvados_base.rb          |   4 +
 apps/workbench/app/models/arvados_resource_list.rb |   7 ++
 apps/workbench/app/models/link.rb                  |  10 ++
 .../app/views/application/_choose.html.erb         |  15 ++-
 .../app/views/application/_content.html.erb        |  48 +-------
 .../_choose_rows.html.erb                          |   5 +-
 .../pipeline_instances/_show_components.html.erb   |   2 +-
 .../app/views/pipeline_instances/show.html.erb     |   6 -
 .../app/views/projects/_show_contents.html.erb     | 123 ---------------------
 .../views/projects/_show_data_collections.html.erb |   9 +-
 .../projects/_show_jobs_and_pipelines.html.erb     |   9 +-
 .../views/projects/_show_other_objects.html.erb    |   9 +-
 .../app/views/projects/_show_permissions.html.erb  |  44 --------
 .../projects/_show_pipeline_templates.html.erb     |   9 +-
 .../app/views/projects/_show_sharing.html.erb      |  95 ++++++++++++++++
 .../app/views/projects/_show_subprojects.html.erb  |   9 +-
 .../app/views/projects/_show_tab_contents.html.erb |  20 +---
 .../_choose_rows.html.erb                          |   7 +-
 apps/workbench/config/routes.rb                    |   6 +-
 .../test/functional/projects_controller_test.rb    |  54 +++++++++
 .../test/integration/pipeline_instances_test.rb    |   1 +
 apps/workbench/test/integration/projects_test.rb   |  75 ++++++++++++-
 apps/workbench/test/integration/users_test.rb      |  24 ++--
 apps/workbench/test/unit/group_test.rb             |   9 ++
 apps/workbench/test/unit/link_test.rb              |  47 +++++++-
 apps/workbench/test/unit/user_test.rb              |   8 ++
 .../app/controllers/arvados/v1/links_controller.rb |  14 ++-
 services/api/app/models/link.rb                    |  11 ++
 services/api/test/fixtures/groups.yml              |  11 ++
 services/api/test/fixtures/links.yml               |  17 +++
 services/api/test/fixtures/users.yml               |  11 ++
 .../functional/arvados/v1/links_controller_test.rb |  67 +++++++++++
 services/api/test/unit/link_test.rb                |  42 +++++++
 41 files changed, 723 insertions(+), 348 deletions(-)
 create mode 100644 apps/workbench/app/assets/javascripts/tab_panes.js
 copy apps/workbench/app/views/{pipeline_templates => groups}/_choose_rows.html.erb (57%)
 delete mode 100644 apps/workbench/app/views/projects/_show_contents.html.erb
 delete mode 100644 apps/workbench/app/views/projects/_show_permissions.html.erb
 create mode 100644 apps/workbench/app/views/projects/_show_sharing.html.erb
 copy apps/workbench/app/views/{pipeline_templates => users}/_choose_rows.html.erb (50%)

       via  fad046d56740092b1483cb646d2f7c92c544c165 (commit)
       via  964350f4132788e07a7ce1b159179a152e9cfcdc (commit)
       via  5605c33a0646b155c18482c8157be4d154382565 (commit)
       via  949ed4898bc5af8eaf0fdd21c00f7242168cfe22 (commit)
       via  ed994d1e767c3017bcda18c1e2401ded86edcabb (commit)
       via  1ddbf7371a838cd8a8be50eb823f58796c46b2b9 (commit)
       via  589d2b599714a5e3c239aa25029f1a0a4261f520 (commit)
       via  5fdfe4ca7ea91f3da518e6b20d970bf6fcd5ba8c (commit)
       via  e8e0eecb50f527461216631c0e8a1888afecb812 (commit)
       via  d5b8f4baf23f0b79e2f9b559b1da6f8898292f9f (commit)
       via  e3a4fe6e461ec3ffde76e973ada7abae52faf050 (commit)
       via  fe8e80e434724578b29d79038a75f677df2ad400 (commit)
       via  2fccbc1d172fe4bd680651261adfdca8f1ba2a63 (commit)
       via  46a7d27450216b1e022d23396931aa1b46c58c73 (commit)
       via  189016bba4c9c0ef2f66663dd8ff38843c8b25e1 (commit)
       via  13f5b1cf8db5a63b825c3dc81520c69500376adb (commit)
       via  67e443d5d1e4a6b6dfe671b3f4310258d386e4f2 (commit)
       via  54050447a56ab3e019746f12eb36b026dd5d2fb0 (commit)
       via  83f2087d9950975591ce5fe9c7f7c9e5db6749d9 (commit)
       via  1b785fd50c259eb42cd2c8c4ba2e440d7bfe0032 (commit)
       via  a7824d56a519db6d729323ca56e653db7e895f3c (commit)
       via  8dd2205fa58f113aff5b855484c8d933521e3cde (commit)
       via  6a2406f04875497a7bfad72fc8bcd73b792fefae (commit)
       via  d188143b2acd99dc594231360eeaf3e178794ff8 (commit)
       via  5722da5b7a5735873b439c0eff2bc4cf2c959002 (commit)
       via  00a92f1bc74b503af5c6f17a3b69992e750fce8f (commit)
       via  ffa64c065ac8b28849395cf3e89fe93814252473 (commit)
       via  cb832ae39672fe1721e3c531374bdbaa4f24161a (commit)
       via  8298d5a841ac106c408b2834dd73091405c2e180 (commit)
       via  36e6ade5a578f3f10e048ba545c4448a71137282 (commit)
       via  0218232df5c6b4e62cced85e17a512dd6cfcae36 (commit)
       via  4e1dda28351f6b7aa91aa6baca8805e283f2694b (commit)
       via  7daa6c8ccfc68ec189b42522fa1481b7c31174a8 (commit)
       via  1a7dc46ec7237d5ca1c4894c977bf6ce5b29763e (commit)
       via  f97f243abfaaae4b04d0dc7fc02e6f54685b16fb (commit)
      from  99d62839eec24dc65760c33f699b3cae2952f01f (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 fad046d56740092b1483cb646d2f7c92c544c165
Merge: 99d6283 964350f
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 21 15:06:50 2014 -0400

    Merge branch 'master' into 3138-wiselinks


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list