arvados.git
9 years agoMerge branch 'master' into 5493-getting-started-modal
Radhika Chippada [Fri, 27 Mar 2015 23:45:53 +0000 (19:45 -0400)]
Merge branch 'master' into 5493-getting-started-modal

9 years ago5493: remove the helper method update_getting_started_shown_user_pref, and instead...
Radhika Chippada [Fri, 27 Mar 2015 23:44:25 +0000 (19:44 -0400)]
5493: remove the helper method update_getting_started_shown_user_pref, and instead perform prefs update in the view itself.

9 years agoMerge branch '5502-node-manager-gce-ssd-wip'
Brett Smith [Fri, 27 Mar 2015 21:16:09 +0000 (17:16 -0400)]
Merge branch '5502-node-manager-gce-ssd-wip'

Refs #5502.

9 years ago5493: add test for the getting_started help menu item.
Radhika Chippada [Fri, 27 Mar 2015 20:52:03 +0000 (16:52 -0400)]
5493: add test for the getting_started help menu item.

9 years ago5493: update user_profile test to expect getting_started modal for users with no...
Radhika Chippada [Fri, 27 Mar 2015 17:51:47 +0000 (13:51 -0400)]
5493: update user_profile test to expect getting_started modal for users with no previous profile configuration;
also, add one more user scenario where prefs exists with getting_started_shown but no profile.

9 years ago5493: (thanks to tom) modal paging is awesome.
Radhika Chippada [Fri, 27 Mar 2015 13:52:49 +0000 (09:52 -0400)]
5493: (thanks to tom) modal paging is awesome.

9 years ago5493: fix a bug in user profile handling where any pre-existing prefs are being lost.
Radhika Chippada [Fri, 27 Mar 2015 01:25:36 +0000 (21:25 -0400)]
5493: fix a bug in user profile handling where any pre-existing prefs are being lost.

9 years ago5493: wiring for 'getting started' popup
Radhika Chippada [Thu, 26 Mar 2015 18:55:37 +0000 (14:55 -0400)]
5493: wiring for 'getting started' popup

9 years ago5502: Node Manager attaches a local SSD to GCE compute nodes.
Brett Smith [Thu, 26 Mar 2015 17:31:01 +0000 (13:31 -0400)]
5502: Node Manager attaches a local SSD to GCE compute nodes.

This is the best option to provide temporary working space for compute
work on GCE.

9 years ago5502: Adjust id and name of Node Manager cloud object mocks.
Brett Smith [Thu, 26 Mar 2015 16:29:38 +0000 (12:29 -0400)]
5502: Adjust id and name of Node Manager cloud object mocks.

Some GCE objects like disk types have predictable names, so it's
helpful to be able to mock objects with the same name.  Use the
name_id argument is the literal name, and generate an id from it.

9 years agocloses #5556
Radhika Chippada [Wed, 25 Mar 2015 23:00:55 +0000 (19:00 -0400)]
closes #5556
Merge branch '5556-collection-show-timeout'

9 years agoMerge branch 'master' into 5556-collection-show-timeout
Radhika Chippada [Wed, 25 Mar 2015 19:47:17 +0000 (15:47 -0400)]
Merge branch 'master' into 5556-collection-show-timeout

9 years agorefs #5247
Radhika Chippada [Wed, 25 Mar 2015 18:59:09 +0000 (14:59 -0400)]
refs #5247
closes #5248
Merge branch '5247-anonymous-doc'

9 years ago5247: couple more caption updates.
Radhika Chippada [Wed, 25 Mar 2015 18:58:27 +0000 (14:58 -0400)]
5247: couple more caption updates.

9 years agoMerge branch 'master' into 5556-collection-show-timeout
Radhika Chippada [Wed, 25 Mar 2015 18:26:45 +0000 (14:26 -0400)]
Merge branch 'master' into 5556-collection-show-timeout

9 years ago5247: some caption updates.
Radhika Chippada [Wed, 25 Mar 2015 18:19:01 +0000 (14:19 -0400)]
5247: some caption updates.

9 years agoMerge branch 'master' into 5247-anonymous-doc
Radhika Chippada [Wed, 25 Mar 2015 17:37:18 +0000 (13:37 -0400)]
Merge branch 'master' into 5247-anonymous-doc

9 years agocloses #5534
Radhika Chippada [Wed, 25 Mar 2015 17:26:34 +0000 (13:26 -0400)]
closes #5534
Merge branch '5534-limit-log-lines'

9 years agoMerge branch 'master' into 5534-limit-log-lines
Radhika Chippada [Wed, 25 Mar 2015 17:25:46 +0000 (13:25 -0400)]
Merge branch 'master' into 5534-limit-log-lines

9 years agocloses #3762
Radhika Chippada [Wed, 25 Mar 2015 17:24:50 +0000 (13:24 -0400)]
closes #3762
Merge branch '3762-delete-list-worker'

9 years agoMerge branch 'master' into 3762-delete-list-worker
Radhika Chippada [Wed, 25 Mar 2015 17:23:33 +0000 (13:23 -0400)]
Merge branch 'master' into 3762-delete-list-worker

9 years agoMerge branch '4253-user-usernames-wip'
Brett Smith [Wed, 25 Mar 2015 15:51:08 +0000 (11:51 -0400)]
Merge branch '4253-user-usernames-wip'

Refs #4253.  Closes #5512.

9 years agoAdded a comment to volume Delete() about race condition.
Peter Amstutz [Wed, 25 Mar 2015 15:48:06 +0000 (11:48 -0400)]
Added a comment to volume Delete() about race condition.

9 years ago4253: Use new username to set up repository and VM logins.
Brett Smith [Wed, 18 Mar 2015 20:00:01 +0000 (16:00 -0400)]
4253: Use new username to set up repository and VM logins.

The usernames added in 4253 have stricter limits than past usernames
generated to set up a repository and VM login.  Use the new generated
username to avoid a weird disconnect between that and these related
objects.  Do a little cleanup in the tests, including removing some
test parameters that now seem redundant under the new rules.

9 years ago4253: Clean up some user setup methods.
Brett Smith [Wed, 18 Mar 2015 19:59:51 +0000 (15:59 -0400)]
4253: Clean up some user setup methods.

As much as possible, use more methods provided by Rails, rather than
reimplementing them ourselves.

9 years ago4253: Add a username attribute to users.
Brett Smith [Tue, 17 Mar 2015 22:10:14 +0000 (18:10 -0400)]
4253: Add a username attribute to users.

* Add the column, and propagate it based on available VM logins or
  e-mail address, if possible.
* Add format validation and tests.
* Set new usernames based on e-mail address, with tests.

9 years ago5556: add test to invoke collection#show with and without include_accept_encoding_hea...
Radhika Chippada [Wed, 25 Mar 2015 15:02:25 +0000 (11:02 -0400)]
5556: add test to invoke collection#show with and without include_accept_encoding_header_in_api_requests config parameter.

9 years ago5556: Added select() to @logs in CollectionsController#show to avoid trasporting...
Radhika Chippada [Wed, 25 Mar 2015 14:16:27 +0000 (10:16 -0400)]
5556: Added select() to @logs in CollectionsController#show to avoid trasporting the unneeded log properties.
Also, added Accept-Encoding request header in workbench request to api server.

9 years agoDocumentation: installation pages improvements. Be clear about the
Ward Vandewege [Tue, 24 Mar 2015 20:53:05 +0000 (16:53 -0400)]
Documentation: installation pages improvements. Be clear about the
purpose of each installation method, and its limitations.

No issue #

9 years ago5247: white space
Radhika Chippada [Tue, 24 Mar 2015 18:28:46 +0000 (14:28 -0400)]
5247: white space

9 years ago5247: anonymous access documentation
Radhika Chippada [Tue, 24 Mar 2015 18:27:04 +0000 (14:27 -0400)]
5247: anonymous access documentation

9 years ago5534: When a pipeline has long running jobs with hundreds of thousands of log lines...
Radhika Chippada [Tue, 24 Mar 2015 13:49:38 +0000 (09:49 -0400)]
5534: When a pipeline has long running jobs with hundreds of thousands of log lines, the log line display is timing out
fetching all those lines. Limiting the number of log lines retrieved helped resolve this issue. Using limit size of 2000.
I was able to see log when I limited to 10000 log lines as well, but it took much longer wait time and I felt a quicker
response might provide a better user experience and hence using 2000 log lines as the limit. Thus the most recent 2000
log lines are fetched, followed by newer log lines from event log if the job is still running.

9 years agoMerge branch '5536-retry-discover-servers' closes #5536
Peter Amstutz [Tue, 24 Mar 2015 13:29:38 +0000 (09:29 -0400)]
Merge branch '5536-retry-discover-servers' closes #5536

9 years agoMerge branch '5529-add-keepproxy-docker-image'
Ward Vandewege [Mon, 23 Mar 2015 20:06:20 +0000 (16:06 -0400)]
Merge branch '5529-add-keepproxy-docker-image'

refs #5529

9 years agoMerge branch 'master' into 5529-add-keepproxy-docker-image
Ward Vandewege [Mon, 23 Mar 2015 20:06:10 +0000 (16:06 -0400)]
Merge branch 'master' into 5529-add-keepproxy-docker-image

9 years agoMerge branch '5524-crunch-temp-keep-errors' closes #5524
Peter Amstutz [Mon, 23 Mar 2015 18:10:12 +0000 (14:10 -0400)]
Merge branch '5524-crunch-temp-keep-errors' closes #5524

9 years ago5524: Match magic string arvados.errors.Keep as likely part of an exception
Peter Amstutz [Mon, 23 Mar 2015 18:08:58 +0000 (14:08 -0400)]
5524: Match magic string arvados.errors.Keep as likely part of an exception
backtrace and mark task as temporary failure.

9 years ago5536: Keepproxy retry keep server discovery on error or empty list.
Peter Amstutz [Mon, 23 Mar 2015 17:54:07 +0000 (13:54 -0400)]
5536: Keepproxy retry keep server discovery on error or empty list.

9 years agoMerge branch '5425-set-docker-memory-limits' refs #5425
Peter Amstutz [Mon, 23 Mar 2015 17:47:17 +0000 (13:47 -0400)]
Merge branch '5425-set-docker-memory-limits' refs #5425

9 years agoMerge branch 'master' into 3762-delete-list-worker
Radhika Chippada [Mon, 23 Mar 2015 16:24:15 +0000 (12:24 -0400)]
Merge branch 'master' into 3762-delete-list-worker

9 years ago3762: create NewWorkQueue instances of pullq and trashq in handers_test and remove...
Radhika Chippada [Mon, 23 Mar 2015 16:11:42 +0000 (12:11 -0400)]
3762: create NewWorkQueue instances of pullq and trashq in handers_test and remove this logic from handlers.
it is expected that keepstore or the tests will create these objects and handlers should not have to.

9 years ago3762: undo the api server discovery document update. trash worker can instead use...
Radhika Chippada [Mon, 23 Mar 2015 16:01:05 +0000 (12:01 -0400)]
3762: undo the api server discovery document update. trash worker can instead use permission_ttl in place of defaultTrashLifetime because these two will be the same.

9 years agoMerge branch '5198-remote-link-ctrl-click' refs #5198
Tom Clegg [Mon, 23 Mar 2015 14:54:18 +0000 (10:54 -0400)]
Merge branch '5198-remote-link-ctrl-click' refs #5198

9 years agoMerge branch 'master' of git.curoverse.com:arvados into 3762-delete-list-worker
Radhika Chippada [Mon, 23 Mar 2015 14:35:34 +0000 (10:35 -0400)]
Merge branch 'master' of git.curoverse.com:arvados into 3762-delete-list-worker

9 years agoMerge branch '5318-git-sharing-note' closes #5318
Peter Amstutz [Mon, 23 Mar 2015 13:05:18 +0000 (09:05 -0400)]
Merge branch '5318-git-sharing-note' closes #5318

9 years ago5198: Merge branch 'master' into 5198-remote-link-ctrl-click
Tom Clegg [Mon, 23 Mar 2015 05:52:50 +0000 (01:52 -0400)]
5198: Merge branch 'master' into 5198-remote-link-ctrl-click

9 years ago5198: Update comment.
Tom Clegg [Mon, 23 Mar 2015 05:46:47 +0000 (01:46 -0400)]
5198: Update comment.

9 years agoAdd a keepproxy docker image
Ward Vandewege [Mon, 23 Mar 2015 00:21:55 +0000 (20:21 -0400)]
Add a keepproxy docker image

refs #5529

9 years agoGo SDK improvements:
Ward Vandewege [Sun, 22 Mar 2015 18:02:26 +0000 (14:02 -0400)]
Go SDK improvements:

- keepclient now respects the ARVADOS_API_HOST_INSECURE environment
  variable

- arvadosclient and keepclient accept (1,yes,true) to enable the
  insecure api host flag, case insensitive.

No issue #

9 years agoMerge branch '5276-job-graph-phantom-tooltip' closes #5276
Tom Clegg [Sat, 21 Mar 2015 20:37:00 +0000 (16:37 -0400)]
Merge branch '5276-job-graph-phantom-tooltip' closes #5276

9 years ago5276: Merge branch 'master' into 5276-job-graph-phantom-tooltip
Tom Clegg [Sat, 21 Mar 2015 20:19:09 +0000 (16:19 -0400)]
5276: Merge branch 'master' into 5276-job-graph-phantom-tooltip

9 years ago5276: Name log fixtures. Fix over-sensitive test.
Tom Clegg [Sat, 21 Mar 2015 20:19:03 +0000 (16:19 -0400)]
5276: Name log fixtures. Fix over-sensitive test.

9 years agorefs #5375
Radhika Chippada [Sat, 21 Mar 2015 13:54:45 +0000 (09:54 -0400)]
refs #5375
Merge branch '5375-preview-collection-text-files'

9 years ago5375: added javascript and rtf application types to white-listed application types...
Radhika Chippada [Sat, 21 Mar 2015 13:32:31 +0000 (09:32 -0400)]
5375: added javascript and rtf application types to white-listed application types after observing that these were disabled when testing in staging.

9 years agocloses #5375
Radhika Chippada [Sat, 21 Mar 2015 10:44:03 +0000 (06:44 -0400)]
closes #5375
Merge branch '5375-preview-collection-text-files'

9 years ago5375: small updates on comments
Radhika Chippada [Sat, 21 Mar 2015 10:42:04 +0000 (06:42 -0400)]
5375: small updates on comments

9 years ago5375: and add the new test file
Radhika Chippada [Sat, 21 Mar 2015 03:14:43 +0000 (23:14 -0400)]
5375: and add the new test file

9 years ago5375: move the mime type tests into a new collections_helper_test.
Radhika Chippada [Sat, 21 Mar 2015 03:11:34 +0000 (23:11 -0400)]
5375: move the mime type tests into a new collections_helper_test.

9 years agoMerge branch 'master' into 5375-preview-collection-text-files
Radhika Chippada [Sat, 21 Mar 2015 03:01:04 +0000 (23:01 -0400)]
Merge branch 'master' into 5375-preview-collection-text-files

9 years agoMerge branch 'master' into 3762-delete-list-worker
Radhika Chippada [Sat, 21 Mar 2015 02:59:42 +0000 (22:59 -0400)]
Merge branch 'master' into 3762-delete-list-worker

9 years ago3762: Expose Discovery func in arvadosclient. Use Discovery to get defaultTrashLifeti...
Radhika Chippada [Sat, 21 Mar 2015 02:58:05 +0000 (22:58 -0400)]
3762: Expose Discovery func in arvadosclient. Use Discovery to get defaultTrashLifetime in trash worker.

9 years ago5319: Bound search in collection PDH fix migration.
Brett Smith [Fri, 20 Mar 2015 21:16:43 +0000 (17:16 -0400)]
5319: Bound search in collection PDH fix migration.

Only search collections that exist when the migration begins.  This
helps avoid an infinite loop where we yield a bad collection, it gets
fixed a new replacement is created, and then we find and yield the
replacement…  Refs #5319.

9 years agoMerge branch 'master' into 3762-delete-list-worker
Radhika Chippada [Fri, 20 Mar 2015 19:56:38 +0000 (15:56 -0400)]
Merge branch 'master' into 3762-delete-list-worker

9 years ago5375: update the fixture pdh with the value got from keep put.
Radhika Chippada [Fri, 20 Mar 2015 19:04:39 +0000 (15:04 -0400)]
5375: update the fixture pdh with the value got from keep put.

9 years ago5375: improved mime_types initializer. enhance collections_helper to use mime_type...
Radhika Chippada [Fri, 20 Mar 2015 18:30:35 +0000 (14:30 -0400)]
5375: improved mime_types initializer. enhance collections_helper to use mime_type sub_type instead of relying on suffix.
update config param name, value, and comment. add .seq, which is another supported extension of fasta to test.

9 years agoMerge branch '5319-collection-pdh-fix-performance-2-wip'
Brett Smith [Fri, 20 Mar 2015 18:08:19 +0000 (14:08 -0400)]
Merge branch '5319-collection-pdh-fix-performance-2-wip'

Refs #5319.

9 years ago5319: Improve collection PDH fix performance with LIKE searches.
Brett Smith [Wed, 18 Mar 2015 14:44:18 +0000 (10:44 -0400)]
5319: Improve collection PDH fix performance with LIKE searches.

PostgreSQL regexp searches use a lot of RAM, and these queries run out
of RAM on qr1hi.  Prefer LIKE queries, which use less RAM and are more
portable.  We have to do multiple searches, but that's life.

9 years agoMerge branch 'master' into 5375-preview-collection-text-files
Radhika Chippada [Fri, 20 Mar 2015 15:30:59 +0000 (11:30 -0400)]
Merge branch 'master' into 5375-preview-collection-text-files

9 years ago3762: Run trash worker. Add tests to test the trash worker.
Radhika Chippada [Fri, 20 Mar 2015 15:27:34 +0000 (11:27 -0400)]
3762: Run trash worker. Add tests to test the trash worker.

9 years ago5276: Use using_wait_time 0 instead of evaluate_script.
Tom Clegg [Thu, 19 Mar 2015 22:23:19 +0000 (18:23 -0400)]
5276: Use using_wait_time 0 instead of evaluate_script.

9 years ago5276: Reveal and update the log graph as soon as the first data point
Tom Clegg [Thu, 19 Mar 2015 22:12:21 +0000 (18:12 -0400)]
5276: Reveal and update the log graph as soon as the first data point
arrives, rather than waiting for the redraw timer.

Return an empty hover tooltip for the placeholder data point. (The
placeholder series is only added when the graph is empty and hideHover
is true, but it doesn't get deleted later when hideHover goes false.)

Render the graph in a show() callback to ensure the div is visible
when Morris creates its SVG element: otherwise the SVG can end up
being created with height=1px. This addresses bugs like "graph doesn't
show up sometimes" and "data point hover tooltips show up, but there's
no graph".

9 years ago5276: Improve job log graph tests.
Tom Clegg [Thu, 19 Mar 2015 17:08:23 +0000 (13:08 -0400)]
5276: Improve job log graph tests.

* Run tests as a non-admin user. (This just needed an update in the
  log simulator to insert the logs with the same owner_uuid as the
  target job.)

* Test graph display/update behavior both with and without an existing
  log entry in the database during initial page display.

9 years ago5276: Remove redundant test teardown.
Tom Clegg [Thu, 19 Mar 2015 16:24:49 +0000 (12:24 -0400)]
5276: Remove redundant test teardown.

9 years agoMerge branch '5285-arpi-use-settings' closes #5285
Peter Amstutz [Thu, 19 Mar 2015 15:12:31 +0000 (11:12 -0400)]
Merge branch '5285-arpi-use-settings' closes #5285

9 years ago5425: Set memory limit on container as a fraction of total system memory
Peter Amstutz [Thu, 19 Mar 2015 14:52:42 +0000 (10:52 -0400)]
5425: Set memory limit on container as a fraction of total system memory
allocated to task each when invoking Docker.

9 years ago5198: Remove href attributes from remote:true links to prevent ctrl-click et al....
Tom Clegg [Thu, 19 Mar 2015 05:50:53 +0000 (01:50 -0400)]
5198: Remove href attributes from remote:true links to prevent ctrl-click et al. from doing the wrong thing.

9 years ago5318: Add note on sharing page for repository object about lag time taking effect.
Peter Amstutz [Wed, 18 Mar 2015 18:44:44 +0000 (14:44 -0400)]
5318: Add note on sharing page for repository object about lag time taking effect.

9 years ago5285: Remove cruft made redundant by Ruby SDK
Peter Amstutz [Wed, 18 Mar 2015 18:36:23 +0000 (14:36 -0400)]
5285: Remove cruft made redundant by Ruby SDK

9 years agoMerge branch '5500-crunch-temporary-failure' refs #5500
Peter Amstutz [Wed, 18 Mar 2015 17:52:58 +0000 (13:52 -0400)]
Merge branch '5500-crunch-temporary-failure' refs #5500

9 years ago5500: Add TASK_TEMPFAIL constant. shell_or_die always exits non-zero on error.
Peter Amstutz [Wed, 18 Mar 2015 17:48:11 +0000 (13:48 -0400)]
5500: Add TASK_TEMPFAIL constant.  shell_or_die always exits non-zero on error.

9 years ago5500: Add SLURM "Communication connection failure" to pattern of temporary node
Peter Amstutz [Wed, 18 Mar 2015 16:23:21 +0000 (12:23 -0400)]
5500: Add SLURM "Communication connection failure" to pattern of temporary node
failures.  "pip install" failure returns temporary error status (111) so the
task can be retried.

9 years ago5375: white space
Radhika Chippada [Wed, 18 Mar 2015 15:13:20 +0000 (11:13 -0400)]
5375: white space

9 years ago5375: enhance the mime_types initializer to add a new type only when that type is...
Radhika Chippada [Wed, 18 Mar 2015 15:04:48 +0000 (11:04 -0400)]
5375: enhance the mime_types initializer to add a new type only when that type is not yet supported by the MIME types gem.

9 years ago5375: after much hair pulling, found the syntax to replace MIME::Types.add(MIME:...
Radhika Chippada [Wed, 18 Mar 2015 14:04:29 +0000 (10:04 -0400)]
5375: after much hair pulling, found the syntax to replace MIME::Types.add(MIME::Type.from_array... since from_array is deprecated; now using MIME::Types.add(MIME::Type.new...

9 years agoMerge branch 'master' into 5375-preview-collection-text-files
Radhika Chippada [Wed, 18 Mar 2015 13:45:21 +0000 (09:45 -0400)]
Merge branch 'master' into 5375-preview-collection-text-files

9 years agorefs #5383
Radhika Chippada [Wed, 18 Mar 2015 13:44:32 +0000 (09:44 -0400)]
refs #5383
Merge branch '5383-api-db-current-time'

9 years agoMerge branch 'master' into 5383-api-db-current-time
Radhika Chippada [Wed, 18 Mar 2015 13:41:23 +0000 (09:41 -0400)]
Merge branch 'master' into 5383-api-db-current-time

9 years ago5383: Add back Time.parse(). Without it the value returned would be of the format...
Radhika Chippada [Wed, 18 Mar 2015 13:38:26 +0000 (09:38 -0400)]
5383: Add back Time.parse(). Without it the value returned would be of the format 2015-03-18 13:37:11 UTC,
and with Time.parse it would be 2015-03-18 09:37:11 -0400, which is the same as Time.now.

9 years agoMerge branch '5313-node-manager-node-naming-tag-wip'
Brett Smith [Wed, 18 Mar 2015 12:56:54 +0000 (08:56 -0400)]
Merge branch '5313-node-manager-node-naming-tag-wip'

Refs #5313.  Closes #5434, #5467.

9 years ago5313: Node Manager has cloud-specific logic to get node FQDNs.
Brett Smith [Fri, 13 Mar 2015 15:11:35 +0000 (11:11 -0400)]
5313: Node Manager has cloud-specific logic to get node FQDNs.

On AWS, we put compute nodes' FQDN in the name field.  On GCE, we
can't do that: it can't contain dots.  Add a node_fqdn classmethod to
cloud drivers to get a node's FQDN from the right place, and use that
method when deciding whether or not to sync a node.

Syncing a node will occasionally raise an "Invalid fingerprint"
exception on GCE.  This is nonfatal.  Add a comment explaining why.

9 years agoMerge branch 'master' into 5375-preview-collection-text-files
Radhika Chippada [Wed, 18 Mar 2015 01:10:01 +0000 (21:10 -0400)]
Merge branch 'master' into 5375-preview-collection-text-files

9 years agocloses #5383
Radhika Chippada [Wed, 18 Mar 2015 01:08:31 +0000 (21:08 -0400)]
closes #5383
Merge branch '5383-api-db-current-time'

9 years ago5383: better test assertion
Radhika Chippada [Wed, 18 Mar 2015 00:50:15 +0000 (20:50 -0400)]
5383: better test assertion

9 years agoMerge branch 'master' into 5383-api-db-current-time
Radhika Chippada [Wed, 18 Mar 2015 00:44:20 +0000 (20:44 -0400)]
Merge branch 'master' into 5383-api-db-current-time

9 years ago5375: add test to verify that collection#show page enalbles / disables file viewing...
Radhika Chippada [Wed, 18 Mar 2015 00:42:40 +0000 (20:42 -0400)]
5375: add test to verify that collection#show page enalbles / disables file viewing correctly.

9 years ago5375: add some of the mime types not supported by mime_types gem to mime_types.rb...
Radhika Chippada [Tue, 17 Mar 2015 23:34:21 +0000 (19:34 -0400)]
5375: add some of the mime types not supported by mime_types gem to mime_types.rb initializer.

9 years agoWhen copying a collection that already exists on the destination, fetch
Peter Amstutz [Tue, 17 Mar 2015 17:35:42 +0000 (13:35 -0400)]
When copying a collection that already exists on the destination, fetch
manifest text from the destination in order to create a new collection with the
correct signing tokens.  closes #5475

9 years ago5383: minor test assertion updates
Radhika Chippada [Tue, 17 Mar 2015 14:57:28 +0000 (10:57 -0400)]
5383: minor test assertion updates

9 years agoMerge branch 'master' into 5383-api-db-current-time
Radhika Chippada [Tue, 17 Mar 2015 14:53:47 +0000 (10:53 -0400)]
Merge branch 'master' into 5383-api-db-current-time

9 years ago5383: add one more test that updates an object twice and verifies the updated_at...
Radhika Chippada [Tue, 17 Mar 2015 14:51:16 +0000 (10:51 -0400)]
5383: add one more test that updates an object twice and verifies the updated_at times are different.