[ARVADOS] updated: ee1b698d98149561c58c7d8c7206d8d4f4dc0bb5

git at public.curoverse.com git at public.curoverse.com
Tue Aug 12 15:19:42 EDT 2014


Summary of changes:
 .../app/assets/javascripts/infinite_scroll.js      |   3 +-
 .../app/controllers/application_controller.rb      |  30 ++++-
 .../app/controllers/projects_controller.rb         |  82 +++++++++---
 .../app/views/application/_content.html.erb        |   3 +-
 .../app/views/application/_content_layout.html.erb |  15 +--
 .../views/application/_tab_line_buttons.html.erb   |   0
 apps/workbench/app/views/application/show.html.erb |   1 -
 .../app/views/collections/_show_files.html.erb     |   5 -
 .../app/views/collections/_show_recent.html.erb    |  13 --
 .../workbench/app/views/collections/index.html.erb |  14 ++
 apps/workbench/app/views/collections/show.html.erb |   7 +-
 .../app/views/keep_disks/_content_layout.html.erb  |   4 +-
 .../views/pipeline_instances/_show_recent.html.erb |   7 -
 .../app/views/pipeline_instances/index.html.erb    |   8 ++
 .../pipeline_templates/_show_components.html.erb   |  17 ---
 .../{_show_components.html.erb => show.html.erb}   |   2 +-
 .../views/projects/_show_contents_rows.html.erb    |  11 +-
 .../views/projects/_show_data_collections.html.erb |  72 +----------
 .../projects/_show_jobs_and_pipelines.html.erb     |  11 +-
 .../views/projects/_show_other_objects.html.erb    |  11 +-
 .../projects/_show_pipeline_templates.html.erb     |  11 +-
 .../app/views/projects/_show_sharing.html.erb      |  10 +-
 .../app/views/projects/_show_subprojects.html.erb  |  11 +-
 .../app/views/projects/_show_tab_contents.html.erb |  10 +-
 ...how_data_collections.html.erb => show.html.erb} |   9 +-
 .../test/functional/projects_controller_test.rb    |  72 ++++++++++-
 apps/workbench/test/integration/projects_test.rb   |  12 +-
 apps/workbench/test/test_helper.rb                 |   3 +
 crunch_scripts/collection-merge                    |  39 ++----
 crunch_scripts/decompress-all.py                   |  62 +++++++++
 crunch_scripts/run-command                         | 143 +++++++++++++++++----
 crunch_scripts/split-fastq.py                      | 128 ++++++++++++++++++
 crunch_scripts/subst.py                            |   6 +-
 docker/jobs/Dockerfile                             |   4 +-
 sdk/cli/bin/arv-run-pipeline-instance              |  12 +-
 .../arvados/v1/repositories_controller.rb          |  10 +-
 .../controllers/arvados/v1/schema_controller.rb    |   1 +
 services/api/app/models/job.rb                     |   2 +-
 services/api/config/application.default.yml        |   5 +
 services/api/test/fixtures/jobs.yml                |  11 ++
 services/api/test/fixtures/pipeline_instances.yml  |   5 +
 41 files changed, 603 insertions(+), 279 deletions(-)
 copy services/fuse/tests/__init__.py => apps/workbench/app/views/application/_tab_line_buttons.html.erb (100%)
 create mode 100644 apps/workbench/app/views/collections/index.html.erb
 create mode 100644 apps/workbench/app/views/pipeline_instances/index.html.erb
 copy apps/workbench/app/views/pipeline_templates/{_show_components.html.erb => show.html.erb} (93%)
 copy apps/workbench/app/views/projects/{_show_data_collections.html.erb => show.html.erb} (86%)
 create mode 100755 crunch_scripts/decompress-all.py
 create mode 100755 crunch_scripts/split-fastq.py

       via  ee1b698d98149561c58c7d8c7206d8d4f4dc0bb5 (commit)
       via  95b978d86375f8a7d30262ebc41ca250e6dcad4f (commit)
       via  71ed41b87ab6b1b2db92752c59fdf7cf59c2b2cd (commit)
       via  b6e28fbe905737bd0ea5bda5f4fd74fd259c58b1 (commit)
       via  6520a31f91a590fe8d559c14e75e6c99a676ba20 (commit)
       via  b00bc4b607cbd1eeb9cf749dc8b681e48002e2bc (commit)
       via  20b2859d2e4114b7224fa55d04d98a0fe3e16ef5 (commit)
       via  588a4505ac005d54b7aad208e038ded0a978425d (commit)
       via  9d76f0c0fc0c35b70f3988695fcb253e1739e36b (commit)
       via  c5be0c3abd926adc54e0c1de65e8dfdd25a84ea1 (commit)
       via  0a53423e423d107e457e1555ce3ec4e9ab2dd911 (commit)
       via  41e77a9116878cd9527d042ce80a987f2c04010e (commit)
       via  3b98ce7a73f94fcf0ccc24bb4b3eac576744cebb (commit)
       via  acba0c0caa17d721724533803f797235ab572d94 (commit)
       via  c7cf7b6012ecf15264e48af9c7fa4a4e93519a40 (commit)
       via  9b5c87a043b10e1d983ec1c7e8b7784e5b79c5ae (commit)
       via  6060e478ec99b9dbc12785fadc76d388d6678fe3 (commit)
       via  fe3b22e8850d28e5d2b30f59c112087d892844dd (commit)
       via  f8df913d401e7d6015631741952429ec683671e8 (commit)
       via  c2cd31f182e588363a20fe855be3058c5505dda8 (commit)
       via  8fc5d7b3a697e08391296ac4d434f4f4a23a695a (commit)
       via  f22dc5b8e0b2d844c03656a959085006b6c56dac (commit)
       via  6f69b8a9314ca4041291411d7a3c57686399e9e5 (commit)
       via  b7744c883953c97568f851995d722a0ed044774e (commit)
       via  e5337814593c504ef71e9f517dc1d99d41e19784 (commit)
       via  fd7cf52127c9aa905aeae09b13dd4d1ee9f66e1c (commit)
       via  efd131427759f5a2663dea04a402054e361b7c90 (commit)
       via  b5393c72ddd855564cae2f2d798a3e4496a8d2ec (commit)
       via  db4c2a1cbf4d526a16e59b58fbac81a703dee87b (commit)
       via  839f0ec7e4931f77eaf537d4642bb769b22fabe6 (commit)
       via  cb880a9fa932988892ffc9f95d38166e9dec5458 (commit)
       via  5edfdafe30ea9d74a5a49602d61934b793762f4b (commit)
       via  b1365ce7c1ccc74f479b1ebdf31b5da52028da84 (commit)
       via  6f231c2537c196644f15eb7cac6f6861ea24e429 (commit)
       via  f00ee875d99ba65aaac178e762fbd3e35ddc5f87 (commit)
       via  2d8508738cc5ae65818f5e6a0ca4e0af15fb6b0c (commit)
       via  57e0202fcbec42bf9f9aabade183c66551be0a88 (commit)
       via  f2263977500c541ae8eefdd1462264593b979d63 (commit)
       via  290274d8413e674d087542f247e944c1277bae2b (commit)
       via  86f97fe1bf8ebb7fb9b3c8c730687074d44d4ad8 (commit)
       via  a73069f409eab6d7ee0c4935097805b228e0e67c (commit)
       via  363d128327963a7c1d93992613a741af4d5f55fd (commit)
       via  d94d24f806debac76b29896bf486067be3cb084c (commit)
       via  9d476c8e51784747298293864026252852480df0 (commit)
       via  cdb015d76288de70b828ade02928b41ebc0feb7a (commit)
       via  fdd0351cfcf54dd64423c9df16902fe83b512619 (commit)
       via  c96db8766d22832ac19d260377d0fa747a657dd1 (commit)
       via  e9509c501f197fb22875bef48a7fa618371f3ca4 (commit)
       via  22383b73db60dd00bb5b9ef68b009828b59b968e (commit)
       via  1c5b0ee281a30b25bc622565dac2df75f99e4863 (commit)
       via  2399e2081ec59c60f6b2ddf47d7235fa30bbd4c7 (commit)
       via  92f63fe18f3b6d8e4ee589e7a962d39ed4754e9e (commit)
       via  a4f3031bb766ca8a9b9dfbc738dbf0dc9bcd5b67 (commit)
       via  708b630be8dc82b3b1b1e246719eb61688efef0f (commit)
       via  c75a4bb16b2ae143023a001ddb92ce175c813c11 (commit)
       via  cd8865242a72db92cb2c6a269ca209e06b0a31ef (commit)
       via  629ff557c7cb0e94080d3faed8b5ed4c53119f29 (commit)
       via  2b18c1a62315bf7eb407d75923d8d3e10b4c7cd2 (commit)
       via  b0dff193d231456b36bed0bca7eac7f78997a8ae (commit)
       via  529efd199afb26cdc7b8a422ab8b69bcee1b3ec8 (commit)
       via  528280155a4a963187736364f74835f2873fc073 (commit)
       via  74fb942ca46cf6f039b961b572f9c0f160a24b93 (commit)
       via  adcf46d59e7da4f08fbc9a94dcae52bc573c24ad (commit)
       via  577c61793d8d9f2452b6b53d3791822d001e339c (commit)
       via  c3b19359bd21c0b2115c4169102327762e48a93b (commit)
       via  baf2c86b3af2d0b8db22aff5d6f427f025d767b7 (commit)
       via  1d13f6a6edd0f101d11edc55663d83ac40f6fbfe (commit)
       via  99d5b548b50c573281d9780ecd631ecf83f4eefe (commit)
       via  06cc4285949e8203a80f1b506b3551b731494dcf (commit)
       via  1774a688181d771790c3c406ae45c99dd26df023 (commit)
       via  d1332738de33f6e5c50b8d444590f4add9663853 (commit)
       via  6755f71e4b5e9474f24f8d79739feb775d91496b (commit)
       via  a8e5a5ee592e9e71c1ce80247212e33d61ae2381 (commit)
       via  e4f893184833d43c4aed29a1825f4db08cb14d0e (commit)
       via  0cf8e41ee88c6cd6e2546958926d7a59991dab4e (commit)
       via  2c7b8f8bee023c438c47aff2f35848bbf6c1ae5f (commit)
       via  5990ac0ad45146fad60d151b24a39c15e72a1d87 (commit)
       via  925a830167cb2af6ededf9a0f6d83a2e672452b8 (commit)
       via  95ec380b85dec7a9004bcfd05e613eeb773c9d60 (commit)
       via  783aff1187eba225008cd7db6fdd8307e46bc59b (commit)
      from  57ee96926d2d3d315ece3b2cbfb20d0fe01ab912 (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 ee1b698d98149561c58c7d8c7206d8d4f4dc0bb5
Merge: 95b978d 71ed41b
Author: radhika <radhika at curoverse.com>
Date:   Tue Aug 12 15:08:59 2014 -0400

    Merge branch 'master' into 3112-report-bug


commit 95b978d86375f8a7d30262ebc41ca250e6dcad4f
Author: radhika <radhika at curoverse.com>
Date:   Tue Aug 12 15:05:11 2014 -0400

    3112: add source_version to discovery document.

diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index a2a5759..eccee8a 100644
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -15,6 +15,7 @@ class Arvados::V1::SchemaController < ApplicationController
         name: "arvados",
         version: "v1",
         revision: "20131114",
+        source_version: (Rails.application.config.source_version ? Rails.application.config.source_version : "No version information available") + (Rails.application.config.local_modified ? Rails.application.config.local_modified.to_s : ''),
         generatedAt: Time.now.iso8601,
         title: "Arvados API",
         description: "The API to interact with Arvados.",
diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index c32900c..5eb0357 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -15,6 +15,7 @@ development:
   active_record.auto_explain_threshold_in_seconds: 0.5
   assets.compress: false
   assets.debug: true
+  local_modified: <%= '-modified' if `git status -s` %>
 
 production:
   force_ssl: true
@@ -173,3 +174,7 @@ common:
   # to sign session tokens. IMPORTANT: This is a site secret. It
   # should be at least 50 characters.
   secret_token: ~
+
+  # source_version
+  source_version: <%= `git log -n 1 --format=%H` %>
+  local_modified: false

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list