arvados.git
9 years agoMerge branch '4310-lock-before-fail' closes #4310 (again)
Peter Amstutz [Fri, 7 Nov 2014 14:28:45 +0000 (09:28 -0500)]
Merge branch '4310-lock-before-fail' closes #4310 (again)

9 years ago4310: Qualify namespace of AlreadyLockedError
Peter Amstutz [Fri, 7 Nov 2014 14:22:34 +0000 (09:22 -0500)]
4310: Qualify namespace of AlreadyLockedError

9 years ago4310: Lock job before changing its state to failed.
Peter Amstutz [Fri, 7 Nov 2014 13:53:55 +0000 (08:53 -0500)]
4310: Lock job before changing its state to failed.

9 years agoMerge branch '4314-crunch-token-expire' refs #4314 refs #4310
Peter Amstutz [Thu, 6 Nov 2014 22:02:34 +0000 (17:02 -0500)]
Merge branch '4314-crunch-token-expire' refs #4314 refs #4310

9 years ago4314: Don't expire the token if the job is still in queued state.
Peter Amstutz [Thu, 6 Nov 2014 21:51:40 +0000 (16:51 -0500)]
4314: Don't expire the token if the job is still in queued state.

9 years agoMerge branch '4408-collection-sharing-login-fix-wip'
Brett Smith [Thu, 6 Nov 2014 20:49:32 +0000 (15:49 -0500)]
Merge branch '4408-collection-sharing-login-fix-wip'

Closes #4408.

9 years ago4408: Workbench Collection sharing allows file downloads again.
Brett Smith [Thu, 6 Nov 2014 16:59:00 +0000 (11:59 -0500)]
4408: Workbench Collection sharing allows file downloads again.

Earlier we refactored our API token loading code to load User.current
to check that it was valid.  This approach doesn't work when we're
presenting shared Collections, because the token usually won't be
scoped to get user information.  Skip the check for this specific
case.

9 years agoMerge branch '4088-collection-show-files-filter'
Tim Pierce [Thu, 6 Nov 2014 19:14:35 +0000 (14:14 -0500)]
Merge branch '4088-collection-show-files-filter'

Fixes #4088.

9 years agoGo to next job after fail_job when there is a tag mismatch. refs #4310
Peter Amstutz [Thu, 6 Nov 2014 18:56:18 +0000 (13:56 -0500)]
Go to next job after fail_job when there is a tag mismatch.  refs #4310

9 years agoMerge branch '4310-git-tag-race' closes #4310
Peter Amstutz [Thu, 6 Nov 2014 18:18:03 +0000 (13:18 -0500)]
Merge branch '4310-git-tag-race' closes #4310

9 years ago4310: Remove stderr redirect from git rev-list, add it to git tag. Prefix log
Peter Amstutz [Thu, 6 Nov 2014 18:11:09 +0000 (13:11 -0500)]
4310: Remove stderr redirect from git rev-list, add it to git tag.  Prefix log
output with "dispatch: ".  Tweak error message if rev-list fails.

9 years agoMerge branch '4383-easy-install'
Ward Vandewege [Thu, 6 Nov 2014 18:00:46 +0000 (13:00 -0500)]
Merge branch '4383-easy-install'

refs #4383

9 years agoMerge branch 'master' into 4383-easy-install
Ward Vandewege [Thu, 6 Nov 2014 18:00:22 +0000 (13:00 -0500)]
Merge branch 'master' into 4383-easy-install

refs #4383

9 years agoAnother documentation tweak based on review feedback.
Ward Vandewege [Thu, 6 Nov 2014 17:59:39 +0000 (12:59 -0500)]
Another documentation tweak based on review feedback.

closes #4383

9 years ago4310: Fix race condition between testing for tag and setting tag by reversing
Peter Amstutz [Thu, 6 Nov 2014 16:37:49 +0000 (11:37 -0500)]
4310: Fix race condition between testing for tag and setting tag by reversing
order of operations: try to set the tag, and only test for it if there is an
error.

9 years agoMerge branch '4389-breadcrumbs-infinite-loop' closes #4389
Tom Clegg [Thu, 6 Nov 2014 16:33:07 +0000 (11:33 -0500)]
Merge branch '4389-breadcrumbs-infinite-loop' closes #4389

9 years agoInstall instructions: be a bit more explicit that arvdock is downloaded
Ward Vandewege [Thu, 6 Nov 2014 16:30:11 +0000 (11:30 -0500)]
Install instructions: be a bit more explicit that arvdock is downloaded
and saved in the current working directory.

refs #4383

9 years agoMerge branch 'master' into 4383-easy-install
Ward Vandewege [Thu, 6 Nov 2014 16:09:00 +0000 (11:09 -0500)]
Merge branch 'master' into 4383-easy-install

refs #4383

9 years agoOnly try to install .config/arvados/settings.conf if we have a token to
Ward Vandewege [Thu, 6 Nov 2014 16:04:36 +0000 (11:04 -0500)]
Only try to install .config/arvados/settings.conf if we have a token to
put in there.

refs #4383

9 years ago4088: code review feedback
Tim Pierce [Thu, 6 Nov 2014 16:02:50 +0000 (11:02 -0500)]
4088: code review feedback

* Modified styling for "Select all" and "Unselect all"
* "filename filter" -> "filename regex"
* Changed refutations to assertions to avoid running afoul of AJAX race
  conditions
* Refactored checkbox assertions into a helper

9 years ago4389: Merge branch 'master' into 4389-breadcrumbs-infinite-loop
Tom Clegg [Thu, 6 Nov 2014 15:55:07 +0000 (10:55 -0500)]
4389: Merge branch 'master' into 4389-breadcrumbs-infinite-loop

9 years agoadd 'arv-run' to setup.py refs #3609
Peter Amstutz [Thu, 6 Nov 2014 15:26:21 +0000 (10:26 -0500)]
add 'arv-run' to setup.py refs #3609

9 years agoAdd more tests so that we cover all possible combinations of the
Ward Vandewege [Thu, 6 Nov 2014 15:25:01 +0000 (10:25 -0500)]
Add more tests so that we cover all possible combinations of the
auto_admin_first_user and auto_admin_user configuration settings.

refs #4383

9 years agoUpdate the behavior of the auto_admin_user configuration field a bit to
Ward Vandewege [Thu, 6 Nov 2014 15:23:11 +0000 (10:23 -0500)]
Update the behavior of the auto_admin_user configuration field a bit to
make it more intuitive: the first user created with an e-mail address
that matches auto_admin_user will now become admin, regardless of the
presence of other admin users. Any subsequent accounts created with that
e-mail address will no longer become admin.

refs #4383

9 years ago4389: Add test.
Tom Clegg [Wed, 5 Nov 2014 22:48:30 +0000 (17:48 -0500)]
4389: Add test.

9 years agoMerge branch 'origin-3609-arv-run' into master closes #3609
Peter Amstutz [Wed, 5 Nov 2014 20:43:40 +0000 (15:43 -0500)]
Merge branch 'origin-3609-arv-run' into master closes #3609

Conflicts:
sdk/cli/bin/arv

9 years agoMerge branch '4357-node-manager-busy-nodes-wip'
Brett Smith [Wed, 5 Nov 2014 19:29:14 +0000 (14:29 -0500)]
Merge branch '4357-node-manager-busy-nodes-wip'

Closes #4357, #4370.

9 years ago4357: Node Manager boots new nodes when up nodes are busy.
Brett Smith [Fri, 31 Oct 2014 17:59:59 +0000 (13:59 -0400)]
4357: Node Manager boots new nodes when up nodes are busy.

The key part of this commit is the change to _nodes_wanted.
Everything else provides the information to make that calculation.

This changes the daemon test to use real monitor actors, rather than a
mock.  This hurts test isolation a bit, but it's really tricky to mock
individual monitors otherwise.  Because monitors only communicate with
the daemon itself, this seems like a worthwhile trade-off; it doesn't
introduce external dependencies or noticeably increase test time.

9 years ago4389: Merge branch 'master' into 4389-breadcrumbs-infinite-loop
Tom Clegg [Wed, 5 Nov 2014 17:22:03 +0000 (12:22 -0500)]
4389: Merge branch 'master' into 4389-breadcrumbs-infinite-loop

9 years agoMerge branch '4303-crunch-retry-logging-wip'
Brett Smith [Wed, 5 Nov 2014 16:31:42 +0000 (11:31 -0500)]
Merge branch '4303-crunch-retry-logging-wip'

Closes #4303, #4385.

9 years ago4303: crunch-job logs when it retries API calls.
Brett Smith [Fri, 31 Oct 2014 18:54:25 +0000 (14:54 -0400)]
4303: crunch-job logs when it retries API calls.

9 years agoFix `arv keep copy` → `arv copy` wrapper.
Brett Smith [Wed, 5 Nov 2014 16:27:50 +0000 (11:27 -0500)]
Fix `arv keep copy` → `arv copy` wrapper.

No issue #.

9 years agoMerge branch 'master' into 4383-easy-install
Ward Vandewege [Wed, 5 Nov 2014 15:21:24 +0000 (10:21 -0500)]
Merge branch 'master' into 4383-easy-install

Conflicts:
docker/api/application.yml.in

refs #4383

9 years agoAdd unit tests for new auto_admin_first_user configuration setting.
Ward Vandewege [Wed, 5 Nov 2014 15:18:31 +0000 (10:18 -0500)]
Add unit tests for new auto_admin_first_user configuration setting.

refs #4383

9 years ago3609: Simplify "group" example a bit more.
Peter Amstutz [Wed, 5 Nov 2014 02:28:12 +0000 (21:28 -0500)]
3609: Simplify "group" example a bit more.

9 years ago3609: Further improve documentation and code comments.
Peter Amstutz [Wed, 5 Nov 2014 02:05:00 +0000 (21:05 -0500)]
3609: Further improve documentation and code comments.

9 years ago3609: Documentation improvements. More error checking on run-command list function...
Peter Amstutz [Tue, 4 Nov 2014 21:28:54 +0000 (16:28 -0500)]
3609: Documentation improvements.  More error checking on run-command list function evaluation.

9 years ago4389: Add debugging tools to dev bundle.
Tom Clegg [Sat, 1 Nov 2014 19:45:04 +0000 (15:45 -0400)]
4389: Add debugging tools to dev bundle.

9 years ago4389: Fix infinite loop when ownership trail terminates at a self-owning user.
Tom Clegg [Sat, 1 Nov 2014 19:44:23 +0000 (15:44 -0400)]
4389: Fix infinite loop when ownership trail terminates at a self-owning user.

9 years ago4412: Remaining Ruby clients use :body_object for API requests.
Brett Smith [Tue, 4 Nov 2014 17:38:55 +0000 (12:38 -0500)]
4412: Remaining Ruby clients use :body_object for API requests.

A follow-up from the last commit.  Refs #4412.

9 years ago4412: arv edit consistently uses :body_object in API requests.
Brett Smith [Tue, 4 Nov 2014 17:31:00 +0000 (12:31 -0500)]
4412: arv edit consistently uses :body_object in API requests.

Fixes #4412.

9 years agoMerge branch '4031-fix-graph-connections' closes #4031
Peter Amstutz [Tue, 4 Nov 2014 15:57:37 +0000 (10:57 -0500)]
Merge branch '4031-fix-graph-connections' closes #4031

9 years agoMerge branch '3618-column-ordering' closes #3618
Phil Hodgson [Tue, 4 Nov 2014 15:16:21 +0000 (16:16 +0100)]
Merge branch '3618-column-ordering' closes #3618

9 years ago4031: Fix tests. Move RequestDuck to test_helper.rb so as not to duplicate code.
Peter Amstutz [Tue, 4 Nov 2014 15:15:16 +0000 (10:15 -0500)]
4031: Fix tests.  Move RequestDuck to test_helper.rb so as not to duplicate code.

9 years agoUpdate version dependency to ensure CollectionReader has a normalize() method. refs...
Tom Clegg [Tue, 4 Nov 2014 14:48:44 +0000 (09:48 -0500)]
Update version dependency to ensure CollectionReader has a normalize() method. refs #3706

9 years agoMerge branch 'master' into 3618-column-ordering
Phil Hodgson [Tue, 4 Nov 2014 14:47:11 +0000 (15:47 +0100)]
Merge branch 'master' into 3618-column-ordering

9 years ago3618: accommodate new fixture indexing in pipeline_instance tests (including run...
Phil Hodgson [Tue, 4 Nov 2014 13:58:44 +0000 (14:58 +0100)]
3618: accommodate new fixture indexing in pipeline_instance tests (including run-time=0 test)

9 years ago3618: accommodate new fixture indexing in pipeline_instance tests
Phil Hodgson [Tue, 4 Nov 2014 11:32:55 +0000 (12:32 +0100)]
3618: accommodate new fixture indexing in pipeline_instance tests

9 years agoWhen auto_admin_first_user is set to true (default false), the first
Ward Vandewege [Mon, 3 Nov 2014 22:32:28 +0000 (17:32 -0500)]
When auto_admin_first_user is set to true (default false), the first
user to sign in on a new installation will be an admin.

refs #4383

9 years agoMerge branch '3706-keep-warning' closes #3706
Tom Clegg [Mon, 3 Nov 2014 22:30:15 +0000 (17:30 -0500)]
Merge branch '3706-keep-warning' closes #3706

9 years ago3706: Oops, the test was broken, the feature works fine.
Tom Clegg [Mon, 3 Nov 2014 22:27:54 +0000 (17:27 -0500)]
3706: Oops, the test was broken, the feature works fine.

9 years ago3706: Add (skipped) test for broken max_manifest_depth=0 feature.
Tom Clegg [Mon, 3 Nov 2014 22:13:38 +0000 (17:13 -0500)]
3706: Add (skipped) test for broken max_manifest_depth=0 feature.

9 years ago4031: Add owner_uuid to graph_test_collection fixtures.
Peter Amstutz [Mon, 3 Nov 2014 21:00:00 +0000 (16:00 -0500)]
4031: Add owner_uuid to graph_test_collection fixtures.

9 years ago3706: Merge branch 'master' into 3706-keep-warning
Tom Clegg [Mon, 3 Nov 2014 20:27:13 +0000 (15:27 -0500)]
3706: Merge branch 'master' into 3706-keep-warning

9 years agoMerge remote-tracking branch 'origin/master' into 4031-fix-graph-connections
Peter Amstutz [Mon, 3 Nov 2014 20:07:10 +0000 (15:07 -0500)]
Merge remote-tracking branch 'origin/master' into 4031-fix-graph-connections

Conflicts:
services/api/test/fixtures/collections.yml

9 years ago4031: Improve provenance graph tests for readability, use fixtures instead of
Peter Amstutz [Mon, 3 Nov 2014 20:06:09 +0000 (15:06 -0500)]
4031: Improve provenance graph tests for readability, use fixtures instead of
hardcoded hashes.  Improve efficiency of matching collections in search_edges.
Remove spurious debug code.

9 years ago3706: Remove superfluous conditional.
Tom Clegg [Mon, 3 Nov 2014 19:33:15 +0000 (14:33 -0500)]
3706: Remove superfluous conditional.

9 years ago3706: Add back "collections.get => 404" to "fallback to Keep" test.
Tom Clegg [Mon, 3 Nov 2014 18:33:06 +0000 (13:33 -0500)]
3706: Add back "collections.get => 404" to "fallback to Keep" test.

9 years agoThe sso server docker image is not used by default at the moment, so
Ward Vandewege [Mon, 3 Nov 2014 18:31:26 +0000 (13:31 -0500)]
The sso server docker image is not used by default at the moment, so
arvdock shouldn't try to start it unless explicitly requested (part 2).

refs #4383

9 years agoThe sso server docker image is not used by default at the moment, so
Ward Vandewege [Mon, 3 Nov 2014 18:31:26 +0000 (13:31 -0500)]
The sso server docker image is not used by default at the moment, so
arvdock shouldn't try to start it unless explicitly requested (part 2).

refs #4383

9 years ago3706: Prefer "is None" and "is not None" to "== None" and "!= None".
Tom Clegg [Mon, 3 Nov 2014 14:35:59 +0000 (09:35 -0500)]
3706: Prefer "is None" and "is not None" to "== None" and "!= None".

9 years ago3706: Mutating normalize() does not return self.
Tom Clegg [Mon, 3 Nov 2014 14:33:16 +0000 (09:33 -0500)]
3706: Mutating normalize() does not return self.

9 years ago3706: Process directory trees in sorted() order, instead of the order
Tom Clegg [Mon, 3 Nov 2014 14:32:16 +0000 (09:32 -0500)]
3706: Process directory trees in sorted() order, instead of the order
returned by os.listdir().

This causes write_directory_tree() to produce a manifest that is
normalized to the greatest extent possible for the given
max_manifest_depth.

9 years ago4388: Ruby Keep::Manifest skips blank lines in manifests.
Brett Smith [Mon, 3 Nov 2014 16:10:51 +0000 (11:10 -0500)]
4388: Ruby Keep::Manifest skips blank lines in manifests.

Closes #4388.

9 years agoThe sso server docker image is not used by default at the moment, so
Ward Vandewege [Mon, 3 Nov 2014 15:33:54 +0000 (10:33 -0500)]
The sso server docker image is not used by default at the moment, so
arvdock shouldn't try to start it unless explicitly requested.

refs #4383

9 years agoThe sso server docker image is not used by default at the moment, so
Ward Vandewege [Mon, 3 Nov 2014 15:33:54 +0000 (10:33 -0500)]
The sso server docker image is not used by default at the moment, so
arvdock shouldn't try to start it unless explicitly requested.

refs #4383

9 years agosystem_user and anonymous_user should be excluded from
Ward Vandewege [Mon, 3 Nov 2014 04:39:40 +0000 (23:39 -0500)]
system_user and anonymous_user should be excluded from
auto_setup_new_user, always.

refs #4383

9 years agosystem_user and anonymous_user should be excluded from
Ward Vandewege [Mon, 3 Nov 2014 04:39:40 +0000 (23:39 -0500)]
system_user and anonymous_user should be excluded from
auto_setup_new_user, always.

refs #4383

9 years agoEnable auto_setup_new_users in the docker API server image.
Ward Vandewege [Mon, 3 Nov 2014 02:03:34 +0000 (21:03 -0500)]
Enable auto_setup_new_users in the docker API server image.

refs #4383

9 years agoEnable auto_setup_new_users in the docker API server image.
Ward Vandewege [Mon, 3 Nov 2014 02:03:34 +0000 (21:03 -0500)]
Enable auto_setup_new_users in the docker API server image.

refs #4383

9 years agoAdd instructions for 'binary' docker installation.
Ward Vandewege [Mon, 3 Nov 2014 01:08:13 +0000 (20:08 -0500)]
Add instructions for 'binary' docker installation.

refs #4383

9 years ago3618: refactor scroll tests to share code
Phil Hodgson [Sat, 1 Nov 2014 14:22:48 +0000 (15:22 +0100)]
3618: refactor scroll tests to share code

9 years ago3706: Clarify test case.
Tom Clegg [Fri, 31 Oct 2014 23:46:26 +0000 (19:46 -0400)]
3706: Clarify test case.

9 years ago3706: Prefer join() to many string concatenations.
Tom Clegg [Fri, 31 Oct 2014 23:36:49 +0000 (19:36 -0400)]
3706: Prefer join() to many string concatenations.

9 years ago3706: Prefer "if x" to "if len(x) > 0".
Tom Clegg [Fri, 31 Oct 2014 22:58:37 +0000 (18:58 -0400)]
3706: Prefer "if x" to "if len(x) > 0".

9 years ago3706: Two blank lines after class definition.
Tom Clegg [Fri, 31 Oct 2014 22:56:16 +0000 (18:56 -0400)]
3706: Two blank lines after class definition.

9 years ago3706: Really make the API server return the wrong data, instead of just saying so.
Tom Clegg [Fri, 31 Oct 2014 21:21:31 +0000 (17:21 -0400)]
3706: Really make the API server return the wrong data, instead of just saying so.

9 years ago3706: Put --normalize and --max-manifest-depth arguments in a mutually_exclusive_group.
Tom Clegg [Fri, 31 Oct 2014 20:48:34 +0000 (16:48 -0400)]
3706: Put --normalize and --max-manifest-depth arguments in a mutually_exclusive_group.

9 years agoMerge branch '4040-fuse-tests'
Tim Pierce [Fri, 31 Oct 2014 20:45:56 +0000 (16:45 -0400)]
Merge branch '4040-fuse-tests'

Fixes #4040.

9 years ago3706: normalize() returns None instead of self. Add equally convenient, and more...
Tom Clegg [Fri, 31 Oct 2014 20:44:19 +0000 (16:44 -0400)]
3706: normalize() returns None instead of self. Add equally convenient, and more Pythonic, manifest_text(normalize=True) feature.

9 years ago3609: Correctly recognize and rewrite directory names in collections.
Peter Amstutz [Fri, 31 Oct 2014 20:37:47 +0000 (16:37 -0400)]
3609: Correctly recognize and rewrite directory names in collections.

9 years ago3706: Catch and return exceptions in _populate_* methods to dry up _populate()
Tom Clegg [Fri, 31 Oct 2014 20:30:07 +0000 (16:30 -0400)]
3706: Catch and return exceptions in _populate_* methods to dry up _populate()

9 years ago4040: code review feedback
Tim Pierce [Fri, 31 Oct 2014 20:21:11 +0000 (16:21 -0400)]
4040: code review feedback

* Renamed
** collection_owned_by_fuse_1 -> collection_1_owned_by_fuse
** collection_owned_by_fuse_2 -> collection_2_owned_by_fuse
* Added fixtures pipeline_instance_owned_by_fuse and
  pipeline_instance_in_fuse_project.
* Added name link for the empty collection, to exercise that links are
  exposed in the filesystem in the expected way.

9 years agoFix broken link in docs. Duh.
Ward Vandewege [Fri, 31 Oct 2014 20:13:52 +0000 (16:13 -0400)]
Fix broken link in docs. Duh.

refs #4186

9 years ago3609: Inherit --retries from _util. Be more specific about error being caught. ...
Peter Amstutz [Fri, 31 Oct 2014 19:26:46 +0000 (15:26 -0400)]
3609: Inherit --retries from _util.  Be more specific about error being caught.  Add comments.

9 years ago4088: use filterable.js to filter on client side
Tim Pierce [Thu, 30 Oct 2014 14:22:02 +0000 (10:22 -0400)]
4088: use filterable.js to filter on client side

Implemented client-side filtering via filterable.js:
* Designated filename rows as "filterable"
* Designated filename pattern input field as "filterable-control"
* Added "Select all" and "Unselect all" buttons with matching
  select_all_files() and unselect_all_files() actions
* Limit selection actions (compare, move, copy etc) to visible page
  elements only.
* Added integration tests "Filtering collection files by regexp" and
  "Creating collection from list of filtered files".

9 years agoMerge branch '4186-install-doc-improvements-2'
Ward Vandewege [Fri, 31 Oct 2014 15:04:03 +0000 (11:04 -0400)]
Merge branch '4186-install-doc-improvements-2'

refs #4186

9 years agoClean up the installation overview pages a bit more.
Ward Vandewege [Fri, 31 Oct 2014 15:03:30 +0000 (11:03 -0400)]
Clean up the installation overview pages a bit more.

refs #4186

9 years agoMerge branch 'master' into 4186-install-doc-improvements-2
Ward Vandewege [Fri, 31 Oct 2014 14:52:24 +0000 (10:52 -0400)]
Merge branch 'master' into 4186-install-doc-improvements-2

9 years agoAdd keepstore installation page.
Ward Vandewege [Fri, 31 Oct 2014 14:47:45 +0000 (10:47 -0400)]
Add keepstore installation page.

refs #4186

9 years agoWorkbench: Change from yui to uglifier to compress javascript in
Ward Vandewege [Fri, 31 Oct 2014 14:43:28 +0000 (10:43 -0400)]
Workbench: Change from yui to uglifier to compress javascript in
config/environments/production.rb.example

No issue #

9 years agoFix typo.
Ward Vandewege [Fri, 31 Oct 2014 02:07:11 +0000 (22:07 -0400)]
Fix typo.

refs #4186

9 years agoKeepproxy just needs an anonymous token.
Ward Vandewege [Wed, 29 Oct 2014 16:27:45 +0000 (12:27 -0400)]
Keepproxy just needs an anonymous token.

refs #4186

9 years agoBatch of improvements for the manual installation documentation:
Ward Vandewege [Wed, 29 Oct 2014 15:40:12 +0000 (11:40 -0400)]
Batch of improvements for the manual installation documentation:

* add prerequisites section
* add shell server section
* add keepproxy section
* many other updates throughout

refs #4186

9 years ago3618: improve api security for sorting to make sure each column we sort by is for...
Phil Hodgson [Fri, 31 Oct 2014 13:04:51 +0000 (14:04 +0100)]
3618: improve api security for sorting to make sure each column we sort by is for a real table and a real column in the db

9 years ago3618: make sure something happens if the order param is actually detected as an array
Phil Hodgson [Fri, 31 Oct 2014 13:04:07 +0000 (14:04 +0100)]
3618: make sure something happens if the order param is actually detected as an array

9 years ago3618: bug fix: was confusing the "desc" meaning a "descending sort" with the "desc...
Phil Hodgson [Fri, 31 Oct 2014 13:03:25 +0000 (14:03 +0100)]
3618: bug fix: was confusing the "desc" meaning a "descending sort" with the "desc" that is the beginning of the column name "description"

9 years agoMerge branch 'master' into 3618-column-ordering
Phil Hodgson [Fri, 31 Oct 2014 12:56:01 +0000 (13:56 +0100)]
Merge branch 'master' into 3618-column-ordering

Conflicts (all resolved including fixes):
apps/workbench/app/controllers/projects_controller.rb
apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
apps/workbench/app/views/projects/_show_tab_contents.html.erb
services/api/app/controllers/arvados/v1/groups_controller.rb

9 years agoMerge branch '3824-crunch-container-setup' closes #3824
Tom Clegg [Thu, 30 Oct 2014 21:13:31 +0000 (17:13 -0400)]
Merge branch '3824-crunch-container-setup' closes #3824

9 years ago3824: Merge branch 'master' into 3824-crunch-container-setup
Tom Clegg [Thu, 30 Oct 2014 21:13:23 +0000 (17:13 -0400)]
3824: Merge branch 'master' into 3824-crunch-container-setup