[ARVADOS] updated: a94e15cab04a19dcbb02f2e95335e337c8e55036
git at public.curoverse.com
git at public.curoverse.com
Fri Feb 6 09:38:29 EST 2015
Summary of changes:
.../app/controllers/application_controller.rb | 6 +-
.../app/controllers/collections_controller.rb | 20 ++-
apps/workbench/app/controllers/jobs_controller.rb | 9 +-
.../controllers/pipeline_instances_controller.rb | 5 +
.../controllers/pipeline_templates_controller.rb | 5 +
.../app/controllers/projects_controller.rb | 25 ++-
apps/workbench/app/helpers/application_helper.rb | 6 +-
apps/workbench/app/models/arvados_api_client.rb | 11 +-
apps/workbench/app/models/arvados_base.rb | 2 +-
apps/workbench/app/models/authorized_key.rb | 4 +
apps/workbench/app/models/collection.rb | 4 -
apps/workbench/app/models/job.rb | 4 -
apps/workbench/app/views/application/404.html.erb | 22 ++-
.../application/_create_new_object_button.html.erb | 7 +
.../views/application/_title_and_buttons.html.erb | 6 +-
.../workbench/app/views/application/index.html.erb | 19 +--
.../collections/_create_new_object_button.html.erb | 1 +
.../app/views/collections/_index_tbody.html.erb | 2 +-
.../app/views/collections/_show_files.html.erb | 171 ++++++++++-----------
.../views/jobs/_create_new_object_button.html.erb | 1 +
.../jobs/_rerun_job_with_options_popup.html.erb | 2 +-
.../app/views/jobs/_show_job_buttons.html.erb | 2 +-
.../pipeline_instances/_running_component.html.erb | 2 +-
.../views/pipeline_instances/_show_inputs.html.erb | 15 +-
.../pipeline_instances/_show_tab_buttons.html.erb | 2 +
.../app/views/pipeline_instances/show.html.erb | 4 +-
.../app/views/pipeline_templates/show.html.erb | 38 +++--
.../app/views/projects/_show_dashboard.html.erb | 10 +-
.../app/views/projects/_show_tab_contents.html.erb | 108 ++++++-------
apps/workbench/app/views/projects/show.html.erb | 2 +-
.../app/views/users/_add_ssh_key_popup.html.erb | 2 +-
.../views/users/_create_new_object_button.html.erb | 6 +
.../app/views/users/_setup_popup.html.erb | 2 +-
apps/workbench/config/application.default.yml | 5 +
.../controllers/application_controller_test.rb | 37 +++++
.../controllers/collections_controller_test.rb | 23 ++-
.../test/controllers/projects_controller_test.rb | 14 ++
.../test/integration/anonymous_access_test.rb | 161 +++++++++++++++++++
apps/workbench/test/integration/errors_test.rb | 1 -
.../test/integration/pipeline_instances_test.rb | 43 +++++-
.../test/integration/user_manage_account_test.rb | 25 ++-
apps/workbench/test/integration/websockets_test.rb | 3 +-
crunch_scripts/crunchutil/subst.py | 7 +-
doc/sdk/cli/index.html.textile.liquid | 44 +++++-
doc/sdk/cli/reference.html.textile.liquid | 13 +-
doc/user/topics/run-command.html.textile.liquid | 10 ++
sdk/cli/bin/crunch-job | 16 +-
sdk/python/tests/test_websockets.py | 1 +
services/api/Gemfile | 4 +-
services/api/Gemfile.lock | 8 +-
.../app/controllers/arvados/v1/links_controller.rb | 2 +-
.../app/controllers/arvados/v1/users_controller.rb | 9 +-
services/api/app/models/arvados_model.rb | 1 +
services/api/app/models/user.rb | 2 +-
...203180223_set_group_class_on_anonymous_group.rb | 14 ++
services/api/db/structure.sql | 4 +-
services/api/lib/current_api_client.rb | 147 +++++++++---------
services/api/test/fixtures/jobs.yml | 24 +++
services/api/test/fixtures/links.yml | 14 ++
services/api/test/fixtures/pipeline_instances.yml | 16 ++
services/api/test/fixtures/pipeline_templates.yml | 39 +++++
services/fuse/tests/test_mount.py | 4 +-
62 files changed, 856 insertions(+), 360 deletions(-)
create mode 100644 apps/workbench/app/views/application/_create_new_object_button.html.erb
create mode 100644 apps/workbench/app/views/collections/_create_new_object_button.html.erb
create mode 100644 apps/workbench/app/views/jobs/_create_new_object_button.html.erb
create mode 100644 apps/workbench/app/views/users/_create_new_object_button.html.erb
create mode 100644 apps/workbench/test/integration/anonymous_access_test.rb
create mode 100644 services/api/db/migrate/20150203180223_set_group_class_on_anonymous_group.rb
via a94e15cab04a19dcbb02f2e95335e337c8e55036 (commit)
via aa613a590c0b03e90432c25f0190adc99ef4f657 (commit)
via e5b8f6826a2034c0c7d7142cff3fb02f64fb8831 (commit)
via 12dee1ebfd6a3fca40c19d751459ba6a071c0a3d (commit)
via 36d6d1609ef342268cc87fc8bfce51bcf7199929 (commit)
via e20040092b47f79365637dd8e26156d95ab5c6ee (commit)
via 1e2e0e4f14a730ba1bbea6a4ced5d87ea2766c35 (commit)
via c58a2c83fa6338358962b8161c576e5391d7bf2b (commit)
via 35c50eb231e3ea0f469db136c92ce9bb9d853ac1 (commit)
via 08b3d5b95216643081c7749bc84a09659d554b7d (commit)
via 12abd300828412255248e98754b767df5deeba3d (commit)
via cad21664e646dd103996dcc36839e77bfd17cdd5 (commit)
via fefdb915c4cdf2c2d92061d9221eacd7cac4682f (commit)
via de6150af4a477390eb8ba73c2f67c2c46c91a3ef (commit)
via bf9d2be7afcc640e18606fa8b9b2e0bc3f2190d1 (commit)
via e31b4ee6fa3da212239dfb5a2e4761ff51ed0928 (commit)
via e98e77b844dc5a4d2dcfa0752f3bd6b74822d88c (commit)
via 549f0a0d6f686d1472b6d5bacc3eb85927c915d5 (commit)
via fa166d52969bb6f002fb62b554ef227194e0febe (commit)
via 74b859d9429c1f048f8e71a799d6a44ff3e870d7 (commit)
via 970766e3167be72c1fe6abdc1609831721dbf62d (commit)
via 18b5b6fa43e380549c6698b9998990a748a9d3e8 (commit)
via 56714c8df2f49a5b28ded29402d1af0cb3e45ba1 (commit)
via 60789154369c7a882561dbecff466787acfef6d5 (commit)
via 063c5461ff2a709455536c759d849d2f393bda68 (commit)
via e0619201d96eb7f9cb8229d1c883f0665d1488ba (commit)
via 906aa5e3427c1e89e5f426191e33af4b1c27fc7e (commit)
via b495d8bd000cc60e2288b93a788aa71cce7f6dec (commit)
via 4d8209df92198e6207d3d38cbb7a189cb319bf3c (commit)
via afabee438a48de83632f0eec51f78a0529b71a0e (commit)
via 5b7495879ac4e9b34fc989f58aae4773f56bb191 (commit)
via 1b39a6e15bb68a088f25bb31c31298a1155dc26c (commit)
via 416c543625bb6a7195a48988dc8f32643ca10aa1 (commit)
via 4cd97b2cf2035c44762865f10b0f51e3ac807566 (commit)
via 0d2e6cf379f33188fa19aed9c0c246a2514e9e81 (commit)
via 9fcabe977798468f2ee896b5f5c1ba6d80703341 (commit)
via b9a8de2241fdbc6c69511efc4af318209e4b4942 (commit)
via 9ea36303cc851a5ffa8d61695c8b4ed14e8954d5 (commit)
via 89a8208e6f88de78991c654ce001b26519b99f0c (commit)
via e1104f98771283a7659eadf881f006e3a3acb4d5 (commit)
via 17c5cc48844053d6aec318fa3fc8fe95b2cf1b4c (commit)
via 42fc0557db4117d736b7511a0f785bdfa1d5111e (commit)
via 7edde4785f7cc325a8c2b109d6fcda176af2650c (commit)
via ec27ba2a576189755d443d54213318741f73d125 (commit)
via 50ab35e7c81a9c1363da289bf76424d669bdf80c (commit)
via 4bc67f80590ebbfe530d55b9109542f2b404e7b7 (commit)
via b23240bded4d76bf953a4f8c499f58d9066c34dc (commit)
via 33e6d3356af3f7eaa484dbaa7a671aa25f5042e4 (commit)
via 03428065459077f94f44c53573944f22bda63779 (commit)
via 9a6559f936fb93f63e163690be4ed670a76dd135 (commit)
via 64e9180b32bd158e157d3a11325d70b90ce1aeac (commit)
via 89d4aec69e1b6d8d1f687951f39d8e11f0e66ecf (commit)
via 96326e988977cd5147dcd4962d6c02bb43e7b330 (commit)
via d487907328f3581cd7c93f73729b1e089430523d (commit)
via 16e6df55c039d4986cdf789b94c62840819beba7 (commit)
via 7f2c45b1312014831e2efd8aa0fb8a116085b036 (commit)
via 89fb910b523686fdf725691c44cb4c63ba464487 (commit)
via 411ce5bc5bf433c976f55fe001fe5979456207f2 (commit)
via 876ca8678991e6fdd96872226cf50c92a2e58229 (commit)
via 332015d1131801b0280aa37aa00eefa5c3c00bd4 (commit)
via 73d8ff765611e02a44525a75e1b97348ea3dc185 (commit)
via 62eaf39454cf7d3874691fc59174c546767de89c (commit)
via 2c447c25f810b52e986649a3f4138c671d066092 (commit)
via 1a462bc4d29fc17cef377d232fc2bf0fd0e72358 (commit)
via 6b972e1753c0606eade16e98c32f8da2f7678652 (commit)
via 9f931ff8477f5ba02b53dcc7a8f65032f0a6d013 (commit)
via 4d1e5c0506cf21824acec1bd8bbf7901b8f4ae6c (commit)
via 7f6d2dbe9ce1a294b4be897e79d612d8c1db71d0 (commit)
via c8f0f0c517af5462c68bcadd72e557e390f1ee19 (commit)
via 487dc40959c4a7a8838624c6e108236320e79c8d (commit)
via b6ca3da4f529dc300f750891022847b071813e57 (commit)
via 934fa5ac0e4da50705739303b55f694a60665529 (commit)
via 71d9ea52ae12dc80d7062657fc5c059a128106d7 (commit)
via 94a3addbee3e4a293ba23483dc34ae316d93fbdd (commit)
via 5dbde597e597b4360584d70eb0dccfc6b48c07d0 (commit)
via 5ae2677e5ba023d23d10b2a81c800a007aa80646 (commit)
from dd72a4de55681da7b5a95ee8b1e659221c48614f (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 a94e15cab04a19dcbb02f2e95335e337c8e55036
Merge: aa613a5 e5b8f68
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Feb 6 00:04:29 2015 -0500
3021: Merge branch 'master' into 3021-leave-api-running
Conflicts:
sdk/python/tests/test_websockets.py
diff --cc sdk/python/tests/test_websockets.py
index 20fa97c,45dd28a..d879ebe
--- a/sdk/python/tests/test_websockets.py
+++ b/sdk/python/tests/test_websockets.py
@@@ -3,21 -3,11 +3,22 @@@ import run_test_serve
import unittest
import arvados
import arvados.events
+import mock
import threading
-class EventTestBase(object):
- def runTest(self):
- run_test_server.authorize_with("admin")
+class WebsocketTest(run_test_server.TestCaseWithServers):
+ MAIN_SERVER = {}
+
+ def setUp(self):
+ self.ws = None
+
+ def tearDown(self):
+ if self.ws:
+ self.ws.close()
++ super(WebsocketTest, self).tearDown()
+
+ def _test_subscribe(self, poll_fallback, expect_type):
+ run_test_server.authorize_with('active')
events = Queue.Queue(3)
self.ws = arvados.events.subscribe(
arvados.api('v1'), [['object_uuid', 'is_a', 'arvados#human']],
commit aa613a590c0b03e90432c25f0190adc99ef4f657
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Feb 5 23:59:35 2015 -0500
3021: We use passenger in dev and test environments, too.
diff --git a/services/api/Gemfile b/services/api/Gemfile
index 7e70eb2..0b2ae5d 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -57,7 +57,7 @@ gem 'rvm-capistrano', :group => :test
gem 'acts_as_api'
-gem 'passenger', :group => :production
+gem 'passenger'
gem 'omniauth', '1.1.1'
gem 'omniauth-oauth2', '1.1.1'
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list