Tom Clegg [Wed, 27 Aug 2014 00:26:02 +0000 (20:26 -0400)]
Merge branch '3354-render-textile' closes #3354
Tom Clegg [Wed, 27 Aug 2014 00:13:41 +0000 (20:13 -0400)]
3354: Merge branch 'master' into 3354-render-textile
Conflicts:
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/helpers/application_helper.rb
apps/workbench/app/models/group.rb
Tom Clegg [Tue, 26 Aug 2014 22:57:37 +0000 (18:57 -0400)]
Fix label for API endpoint. Re-order fields. refs #3112
Tom Clegg [Tue, 26 Aug 2014 22:51:53 +0000 (18:51 -0400)]
Ensure source_version is a string, even when it consists entirely of decimal digits. refs #3112
Tom Clegg [Tue, 26 Aug 2014 18:15:15 +0000 (14:15 -0400)]
Run the task setup script inside the container (if any), instead of
running setup on the host, using bind-mount for CRUNCH_SRC, and
assuming other directories have already been set up in the docker
image.
No issue #
Tom Clegg [Tue, 26 Aug 2014 23:51:26 +0000 (19:51 -0400)]
Merge branch '3627-selectable-projects' closes #3627
radhika [Tue, 26 Aug 2014 19:32:41 +0000 (15:32 -0400)]
refs #3620
Merge branch '3620-admin-only-gear-menu'
radhika [Tue, 26 Aug 2014 19:28:23 +0000 (15:28 -0400)]
3620: correct indentation when current user is available
radhika [Tue, 26 Aug 2014 18:47:46 +0000 (14:47 -0400)]
closes #3620
Merge branch '3620-admin-only-gear-menu'
radhika [Tue, 26 Aug 2014 18:45:43 +0000 (14:45 -0400)]
Merge branch 'master' into 3620-admin-only-gear-menu
radhika [Tue, 26 Aug 2014 18:45:03 +0000 (14:45 -0400)]
closes #3642
Merge branch '3642-search-for-active-only'
radhika [Tue, 26 Aug 2014 18:42:53 +0000 (14:42 -0400)]
3620: change menu item role from presentation to menuitem for clickable links. w3.org/TR/wai-aria/roles#role_definitions
radhika [Tue, 26 Aug 2014 18:04:48 +0000 (14:04 -0400)]
Merge branch 'master' into 3642-search-for-active-only
radhika [Tue, 26 Aug 2014 18:00:05 +0000 (14:00 -0400)]
Merge branch 'master' into 3620-admin-only-gear-menu
radhika [Tue, 26 Aug 2014 17:57:50 +0000 (13:57 -0400)]
closes #3112
Merge branch '3112-report-bug'
radhika [Tue, 26 Aug 2014 17:57:19 +0000 (13:57 -0400)]
Merge branch 'master' into 3112-report-bug
radhika [Tue, 26 Aug 2014 17:56:30 +0000 (13:56 -0400)]
3112: 404 error page default message while reporting issue
Peter Amstutz [Tue, 26 Aug 2014 17:51:42 +0000 (13:51 -0400)]
Fixed missing import in robust_put. no issue #
radhika [Tue, 26 Aug 2014 17:20:43 +0000 (13:20 -0400)]
3112: login_tests works with javascript driver
radhika [Tue, 26 Aug 2014 17:10:23 +0000 (13:10 -0400)]
3112: still the login_tests fails when ran in the entire suite
radhika [Tue, 26 Aug 2014 16:30:26 +0000 (12:30 -0400)]
3112: removed rack_test driver and added selenium driver. still the test "trying to use expired token redirects to login page" fails when the entire suite is tested, but passes when this one test file is executed.
radhika [Tue, 26 Aug 2014 16:10:05 +0000 (12:10 -0400)]
3112: add scrollbar to the report issue popup
radhika [Tue, 26 Aug 2014 15:42:01 +0000 (11:42 -0400)]
Merge branch 'master' into 3112-report-bug
radhika [Tue, 26 Aug 2014 15:40:36 +0000 (11:40 -0400)]
3112: skip filters in actions controller, instead of application controller
Peter Amstutz [Tue, 26 Aug 2014 15:36:12 +0000 (11:36 -0400)]
Merge branch '3136-stale-pipeline-instance-display' closes #3136
radhika [Tue, 26 Aug 2014 15:32:59 +0000 (11:32 -0400)]
3112: no need to reload after sending report.
Brett Smith [Tue, 26 Aug 2014 15:32:10 +0000 (11:32 -0400)]
Merge branch '3147-pysdk-retries'
Closes #3147.
Brett Smith [Tue, 26 Aug 2014 00:58:37 +0000 (20:58 -0400)]
3147: Fix unwanted integer division in KeepClient logs.
Brett Smith [Fri, 22 Aug 2014 17:38:40 +0000 (13:38 -0400)]
3147: Add retry support to Python SDK's KeepClient.
Brett Smith [Fri, 22 Aug 2014 19:57:36 +0000 (15:57 -0400)]
3147: Remove old Keep signing support from Python SDK.
Per Tom.
Brett Smith [Tue, 26 Aug 2014 13:46:46 +0000 (09:46 -0400)]
3147: Add check_http_response_success to Python SDK.
Other parts of the SDK need to end loops based on the result of an
HTTP request. This function puts that logic in one place.
Brett Smith [Tue, 26 Aug 2014 13:46:17 +0000 (09:46 -0400)]
3147: Add RetryLoop to the Python SDK.
This provides a general-purpose mechanism for us to retry all kinds of
operations.
Brett Smith [Thu, 21 Aug 2014 15:13:23 +0000 (11:13 -0400)]
3147: Move fake Python HTTP response generation to arvados_testutil.
Other tests can use this functionality.
Peter Amstutz [Tue, 26 Aug 2014 15:25:01 +0000 (11:25 -0400)]
3136: Use map to correctly get the list of uuids. Check that there is a job
record before trying to use it.
Tom Clegg [Tue, 26 Aug 2014 15:24:32 +0000 (11:24 -0400)]
Fix test. refs #3149
radhika [Tue, 26 Aug 2014 15:17:24 +0000 (11:17 -0400)]
Merge branch 'master' into 3112-report-bug
Tom Clegg [Tue, 26 Aug 2014 15:14:07 +0000 (11:14 -0400)]
Fix migration and api templates that rely on changes that did not end up happening. refs #3036
Tom Clegg [Tue, 26 Aug 2014 15:00:53 +0000 (11:00 -0400)]
Merge branch '3149-server-side-search' closes #3149
Tom Clegg [Tue, 26 Aug 2014 15:00:16 +0000 (11:00 -0400)]
3149: Merge branch 'master' into 3149-server-side-search
Tom Clegg [Tue, 26 Aug 2014 13:49:37 +0000 (09:49 -0400)]
Set up arvados env vars when running arv-normalize. No issue #
Peter Amstutz [Tue, 26 Aug 2014 14:45:17 +0000 (10:45 -0400)]
Merge branch '3036-collection-uuids' closes #3036
Peter Amstutz [Tue, 26 Aug 2014 14:43:41 +0000 (10:43 -0400)]
Merge branch 'master' into 3036-collection-uuids
Conflicts:
services/api/test/fixtures/groups.yml
Peter Amstutz [Tue, 26 Aug 2014 12:48:08 +0000 (08:48 -0400)]
3036: Fix merge conflicts. One python sdk test still fails.
Tom Clegg [Tue, 26 Aug 2014 05:41:53 +0000 (01:41 -0400)]
Move styles out of tab partial. No issue #
Tom Clegg [Tue, 26 Aug 2014 05:29:04 +0000 (01:29 -0400)]
Propagate query params to tab panes. No issue #
Tom Clegg [Tue, 26 Aug 2014 04:20:13 +0000 (00:20 -0400)]
Remove uuid-guessing code from "combine selected files". refs #3504
Tom Clegg [Tue, 26 Aug 2014 03:51:25 +0000 (23:51 -0400)]
Do not blow up in install stage when TASK_WORK is not set. No issue #
Tom Clegg [Tue, 26 Aug 2014 03:26:38 +0000 (23:26 -0400)]
Do not blow up when tmp directory already exists. No issue #
radhika [Tue, 26 Aug 2014 03:16:58 +0000 (23:16 -0400)]
Merge branch '3112-report-bug' into 3642-search-for-active-only
radhika [Tue, 26 Aug 2014 03:16:22 +0000 (23:16 -0400)]
Merge branch '3112-report-bug' into 3620-admin-only-gear-menu
radhika [Tue, 26 Aug 2014 03:12:55 +0000 (23:12 -0400)]
3112: alert left justification
radhika [Tue, 26 Aug 2014 03:09:37 +0000 (23:09 -0400)]
Merge branch 'master' into 3112-report-bug
Tom Clegg [Tue, 26 Aug 2014 02:29:11 +0000 (22:29 -0400)]
3149: Clarify comments. Stick with a-b-c data keys where possible;
when not possible, explain why not.
Tom Clegg [Tue, 26 Aug 2014 01:50:41 +0000 (21:50 -0400)]
Merge branch '3149-filter-any' refs #3149
Tom Clegg [Tue, 26 Aug 2014 01:48:47 +0000 (21:48 -0400)]
3149: Explain what "any" does as a filter attribute.
Tom Clegg [Tue, 26 Aug 2014 01:33:57 +0000 (21:33 -0400)]
Fix test fixtures breaking Workbench tests. refs #3171
radhika [Tue, 26 Aug 2014 01:26:43 +0000 (21:26 -0400)]
Merge branch 'master' into 3112-report-bug
Tom Clegg [Tue, 26 Aug 2014 00:59:37 +0000 (20:59 -0400)]
Do not blow up when stdout!=subprocess.PIPE. no issue #
Tom Clegg [Tue, 26 Aug 2014 00:41:43 +0000 (20:41 -0400)]
Merge branch '3660-project-editable' closes #3660
Tom Clegg [Tue, 26 Aug 2014 00:41:23 +0000 (20:41 -0400)]
3660: Clarify self-contradicting comment.
Tom Clegg [Tue, 26 Aug 2014 00:34:00 +0000 (20:34 -0400)]
Update Gemfile.lock. refs #3405
Tom Clegg [Tue, 26 Aug 2014 00:24:56 +0000 (20:24 -0400)]
Merge branch '3171-admin-groups' closes #3171
Tom Clegg [Tue, 26 Aug 2014 00:24:12 +0000 (20:24 -0400)]
Instead of munging TASK_WORK var, mkdir -p it (and therefore JOB_WORK)
in setup script.
Without this, scripts that write to arvados.current_job().tmpdir
(i.e., JOB_WORK) fail.
No issue #
radhika [Mon, 25 Aug 2014 23:31:33 +0000 (19:31 -0400)]
Merge branch '3112-report-bug' into 3642-search-for-active-only
radhika [Mon, 25 Aug 2014 23:30:18 +0000 (19:30 -0400)]
3620: minor test update
radhika [Mon, 25 Aug 2014 23:21:08 +0000 (19:21 -0400)]
Merge branch '3112-report-bug' into 3620-admin-only-gear-menu
radhika [Mon, 25 Aug 2014 23:19:41 +0000 (19:19 -0400)]
3112: move manage account testing into its own file
radhika [Mon, 25 Aug 2014 21:33:36 +0000 (17:33 -0400)]
Merge branch '3112-report-bug' into 3642-search-for-active-only
radhika [Mon, 25 Aug 2014 21:32:18 +0000 (17:32 -0400)]
Merge branch '3112-report-bug' into 3620-admin-only-gear-menu
radhika [Mon, 25 Aug 2014 21:20:51 +0000 (17:20 -0400)]
3112: update issue report routes config and some other minor test updates.
Tom Clegg [Mon, 25 Aug 2014 20:53:02 +0000 (16:53 -0400)]
Do not blow up with pipeline has a plain value in a script_parameter. No issue #
radhika [Mon, 25 Aug 2014 20:52:39 +0000 (16:52 -0400)]
3112: fix indentation
radhika [Mon, 25 Aug 2014 20:43:58 +0000 (16:43 -0400)]
3112: add some space below the submit button and alert panel
Peter Amstutz [Mon, 25 Aug 2014 20:29:32 +0000 (16:29 -0400)]
Merge branch 'master' into 3036-collection-uuids
Conflicts:
sdk/python/arvados/commands/put.py
services/api/app/controllers/application_controller.rb
services/api/app/controllers/arvados/v1/collections_controller.rb
services/api/app/models/arvados_model.rb
services/api/test/fixtures/groups.yml
services/api/test/fixtures/links.yml
radhika [Mon, 25 Aug 2014 20:25:58 +0000 (16:25 -0400)]
3112: minor cleanup
radhika [Mon, 25 Aug 2014 18:37:38 +0000 (14:37 -0400)]
Merge branch '3112-report-bug' into 3620-admin-only-gear-menu
radhika [Mon, 25 Aug 2014 18:37:07 +0000 (14:37 -0400)]
Merge branch '3112-report-bug' into 3642-search-for-active-only
radhika [Mon, 25 Aug 2014 18:36:55 +0000 (14:36 -0400)]
Merge branch 'master' into 3112-report-bug
radhika [Mon, 25 Aug 2014 18:32:46 +0000 (14:32 -0400)]
3642: display search box in topnav only to active users
Tom Clegg [Mon, 25 Aug 2014 18:16:11 +0000 (14:16 -0400)]
Merge branch '3171-group-membership' refs #3171
Tom Clegg [Mon, 25 Aug 2014 18:15:57 +0000 (14:15 -0400)]
3171: Merge branch 'master' into 3171-group-membership
Conflicts:
services/api/test/fixtures/links.yml
Tom Clegg [Mon, 25 Aug 2014 18:12:37 +0000 (14:12 -0400)]
3171: Fix wording, update docs.
radhika [Mon, 25 Aug 2014 17:56:05 +0000 (13:56 -0400)]
3620: display gear menu to admin users only. update the layout tests accordingly.
Tim Pierce [Mon, 25 Aug 2014 17:31:01 +0000 (13:31 -0400)]
Merge branch '3448-keep-put-timestamps'
Closes #3448.
radhika [Mon, 25 Aug 2014 17:29:39 +0000 (13:29 -0400)]
Merge branch 'master' into 3112-report-bug
radhika [Mon, 25 Aug 2014 16:09:41 +0000 (12:09 -0400)]
3112: minor update in application layout test
radhika [Mon, 25 Aug 2014 16:04:20 +0000 (12:04 -0400)]
Merge branch 'master' into 3112-report-bug
radhika [Mon, 25 Aug 2014 16:02:57 +0000 (12:02 -0400)]
3112: Move profile testing out of application_layout_test.rb into it's own file for better testability.
Ward Vandewege [Mon, 25 Aug 2014 15:39:05 +0000 (11:39 -0400)]
Do not blow up in crunch-dispatch.rb: do not pass --jobs and --pipelines
arguments to Rails.
no issue #
Ward Vandewege [Mon, 25 Aug 2014 15:29:53 +0000 (11:29 -0400)]
Do not blow up in crunch-dispatch: fix syntax error. Ouch.
no issue #
radhika [Mon, 25 Aug 2014 15:13:51 +0000 (11:13 -0400)]
Merge branch 'master' into 3112-report-bug
Tim Pierce [Mon, 25 Aug 2014 14:40:28 +0000 (10:40 -0400)]
3448: update tests with "untouchable" volumes
Added a "Touchable" flag to MockVolume, so that we can test that
PutBlock does the right thing when Touch fails. Previous code was using
volume.Bad as an attempt to test this, but that short-circuited the Put
request before it ever attempted to call Touch.
Added TODOs with more testing improvements we can make as time permits.
radhika [Mon, 25 Aug 2014 14:40:27 +0000 (10:40 -0400)]
3354: add integration tests verify textile descriptions for projects
Tom Clegg [Mon, 25 Aug 2014 14:16:27 +0000 (10:16 -0400)]
Merge branch 'multiple-dispatch' no issue #
Tom Clegg [Mon, 25 Aug 2014 14:05:14 +0000 (10:05 -0400)]
crunch-dispatch can run --jobs, --pipelines, or both.
Peter Amstutz [Mon, 25 Aug 2014 13:23:34 +0000 (09:23 -0400)]
3136: Fetch actual job objects for use in rendering pipeline jobs.
Peter Amstutz [Mon, 25 Aug 2014 12:51:47 +0000 (08:51 -0400)]
With new apiserver, after upload, arv-put prints portable data hash instead of
collection uuid for compatibility with crunch. refs #3504
Tom Clegg [Mon, 25 Aug 2014 03:43:53 +0000 (23:43 -0400)]
3149: Propagate filters from remote->dialog->infinite. Fix tests.
Tom Clegg [Mon, 25 Aug 2014 02:40:09 +0000 (22:40 -0400)]
3149: Do not blow up on small devices/windows.
Tom Clegg [Mon, 25 Aug 2014 02:23:43 +0000 (22:23 -0400)]
3149: Do not preload results in search dialog. Let infinite scroll do it.
projects / arvados.git / log