[ARVADOS] updated: 7f7cd27d5fc31dc5bbec7f95905fd394a5b317c7

git at public.curoverse.com git at public.curoverse.com
Wed Apr 23 12:12:49 EDT 2014


Summary of changes:
 .gitignore                                         |    3 +
 apps/workbench/.gitignore                          |    1 -
 .../app/controllers/application_controller.rb      |   12 ++-
 .../controllers/pipeline_instances_controller.rb   |   41 ------
 apps/workbench/app/helpers/application_helper.rb   |  131 +++++++++++--------
 apps/workbench/app/helpers/collections_helper.rb   |   33 +++++
 .../app/helpers/pipeline_instances_helper.rb       |   18 +---
 .../app/helpers/pipeline_templates_helper.rb       |   24 ----
 apps/workbench/app/models/arvados_api_client.rb    |    2 +-
 apps/workbench/app/models/arvados_base.rb          |    8 +-
 .../views/application/_arvados_attr_value.html.erb |    2 +-
 .../app/views/collections/_show_files.html.erb     |   25 +++--
 .../pipeline_instances/_show_components.html.erb   |    6 +-
 .../_show_components_editable.html.erb             |   48 +++++++
 .../pipeline_templates/_show_components.html.erb   |    2 +-
 .../_show_components_template.html.erb             |   54 --------
 apps/workbench/config/environments/test.rb         |    1 +
 .../pipeline_instances_controller_test.rb          |   58 +++++++++
 .../test/functional/users_controller_test.rb       |    5 +
 .../app/controllers/arvados/v1/jobs_controller.rb  |   25 +++--
 .../app/controllers/arvados/v1/nodes_controller.rb |    2 +-
 .../app/controllers/arvados/v1/users_controller.rb |    4 +-
 services/api/app/models/arvados_model.rb           |   21 +++-
 services/api/app/models/job.rb                     |    4 +
 services/api/app/models/pipeline_instance.rb       |    3 +-
 services/api/app/models/user.rb                    |    6 +-
 .../views/user_notifier/account_is_setup.text.erb  |   13 ++-
 services/api/config/environments/test.rb.example   |    3 +
 services/api/script/crunch-dispatch.rb             |    2 +-
 services/api/test/fixtures/jobs.yml                |   21 +++-
 services/api/test/fixtures/links.yml               |   12 ++
 services/api/test/fixtures/pipeline_templates.yml  |   36 ++++++
 .../functional/arvados/v1/jobs_controller_test.rb  |   15 +++
 .../functional/arvados/v1/links_controller_test.rb |   37 ++++++
 .../v1/pipeline_instances_controller_test.rb       |   24 ++++
 .../functional/arvados/v1/users_controller_test.rb |    7 +-
 services/api/test/unit/user_notifier_test.rb       |    4 +-
 services/api/test/unit/user_test.rb                |   59 +++++++++-
 services/keep/build.sh                             |   36 ++++++
 services/keep/{ => src}/keep/keep.go               |    0
 services/keep/{ => src}/keep/keep_test.go          |    0
 41 files changed, 562 insertions(+), 246 deletions(-)
 delete mode 100644 apps/workbench/app/helpers/pipeline_templates_helper.rb
 create mode 100644 apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb
 delete mode 100644 apps/workbench/app/views/pipeline_templates/_show_components_template.html.erb
 create mode 120000 apps/workbench/config/environments/test.rb
 create mode 100644 services/api/test/fixtures/pipeline_templates.yml
 create mode 100755 services/keep/build.sh
 rename services/keep/{ => src}/keep/keep.go (100%)
 rename services/keep/{ => src}/keep/keep_test.go (100%)

       via  7f7cd27d5fc31dc5bbec7f95905fd394a5b317c7 (commit)
       via  49aaa9f26dfaf50056abd7527976b681be26208b (commit)
       via  f03e21f7d50e34e7f7f7e7f570e8604fbd4d27da (commit)
       via  35295980b918232db8a8f3321e3bf02729e26c9f (commit)
       via  074147b4138f7a29ed9ff054b916ac1856b71e9f (commit)
       via  beef5fec7c77e3de84902969f877f1b4d5b89eef (commit)
       via  3aa0915d0b9b0affd9a784df3d138f0d13df303b (commit)
       via  8bd2381e50d3c575cef3bc0f0d4c10a9bafaf292 (commit)
       via  8d6efcbfb559e377a8f21873b736390035bc44ed (commit)
       via  309e25a64fe994867db8459543af372f850e25b9 (commit)
       via  afe657cad834e66867b11bef08a5e9a372f525a4 (commit)
       via  aab0fe9d849952d926a252fac1fedd7e643f5a00 (commit)
       via  21e96241f20ddec17d6d122a489902204a2a0781 (commit)
       via  4d629923847cac25ed6bdaf5c96e1f33a1a8e0c8 (commit)
       via  30b02581c938c05b804f7510a1fc8e850830b9cd (commit)
       via  c0deafee7a8c1938af6592b488a46fca2f0c1688 (commit)
       via  86b78741c1d70ae5551a68dbee0cb51a5749edaf (commit)
       via  d0fce657daf5b12744538f8364faf7c6d352f280 (commit)
       via  2340ebeaf34778645e6071e8b077df50e5ae3df5 (commit)
       via  1881da329b33f722e35bef267c616a784163e482 (commit)
       via  fe046f1313fe9a0d56d4a000347b64f8686b7b48 (commit)
       via  eb7227693e8847a65798afa7f7e8a4ffe8a199a4 (commit)
       via  7c5ae57edcd37b5be47e0578b709f41cb97f0748 (commit)
       via  1452044e468074674b5a16c1990ada4f2c1485ec (commit)
       via  05d6da1868a2ecef39bcf17bbc336e1c58eba7ea (commit)
       via  481e341b75f1c6c0015171539c008e540dea2c2d (commit)
       via  0589ee6c2384e9a38720d67c8b86f5adf1d27902 (commit)
       via  f64a44536ad550ba4424a7f34f7358938b0e4dcc (commit)
       via  60a660385c1643efbdf11a8e5fa1deae1f008d2b (commit)
       via  4729ceb08aa3846326d1729f766f8f10179a2a78 (commit)
       via  c9f04f87062eec4097dc74dcc79b364fb905851c (commit)
       via  1b7d5cef1b7890994826a44102b589124a2a2340 (commit)
       via  7a98271d94163cdc4afa5bfcf275db353bc062d2 (commit)
       via  2e86954da9d4561cc42d52e8505eb12aa95f6470 (commit)
       via  10b0009bb8d4a5bf30f521f2e7fac6e69dd09a68 (commit)
       via  2d743356fb98a857f31be21eb398688d9ba96d71 (commit)
       via  085e614c8e7d1a29e675cf839a1ce9d92ffc5d5c (commit)
       via  6d59f29ba37c608e4b01b27a2fa78bc065fdc2a6 (commit)
       via  b6ee74d757dc98b558dfdb420be46d0b954dc446 (commit)
       via  f7bec4b4fde3c9cdec0823719f4d0806ee27021a (commit)
       via  7b3f8ace626fa8fe401742fd9b2a616d651d6c2b (commit)
       via  0d4ddf36fb71ecf7cc981c67c07584a3a7fcac46 (commit)
       via  5f3de04d46dd4aeec45731b4e5c479c689eee7b6 (commit)
      from  8a0051a6fdd00f83e566cc87b88d2ac23ad5487d (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 7f7cd27d5fc31dc5bbec7f95905fd394a5b317c7
Merge: 8a0051a 49aaa9f
Author: Misha Zatsman <misha-arvados at zatsman.com>
Date:   Wed Apr 23 16:11:45 2014 +0000

    Merge branch 'master' of git.curoverse.com:arvados into 2612-workbench-displays-user-storage


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list