arvados.git
10 years ago2936: improve progress bar for failed jobs
Tim Pierce [Tue, 17 Jun 2014 13:57:00 +0000 (09:57 -0400)]
2936: improve progress bar for failed jobs

Ensure that:

* All job progress bars reflect at least one task.  If a job has no
  tasks at all (done, failed, finished, or todo) that should be
  considered a failed job, so render a progress bar as though one task
  ran and failed.

* A failed job (j[:success] == false) always shows at least one failed
  task.  If a job is marked as failed but has no failed tasks, then
  pretend there was one failed task so at least some red will appear in
  the progress bar.

Fixes #2936.

10 years agoMerge branch '2934-limit-crunch-logs'
Tim Pierce [Mon, 16 Jun 2014 17:27:54 +0000 (13:27 -0400)]
Merge branch '2934-limit-crunch-logs'

Closes #2934

10 years ago2934: document stderr messages for commit tests
Tim Pierce [Mon, 16 Jun 2014 17:19:32 +0000 (13:19 -0400)]
2934: document stderr messages for commit tests

Some unit tests for the Commit models issue alarming but expected git
error messages on stderr.  Added comments documenting these in
commits_controller_test.rb.

Refs #2934.

10 years ago2934: add crunch_dispatch_test repository
Tim Pierce [Mon, 16 Jun 2014 14:56:44 +0000 (10:56 -0400)]
2934: add crunch_dispatch_test repository

Move files for crunch_dispatch_test to their own test fixture
repository.

Refs #2934.

10 years agoMerge branch 'master' into 2934-limit-crunch-logs
Tim Pierce [Fri, 13 Jun 2014 21:24:42 +0000 (17:24 -0400)]
Merge branch 'master' into 2934-limit-crunch-logs

Refs #2934

10 years agoFix infinite scroll in chooser. refs #2872
Tom Clegg [Fri, 13 Jun 2014 20:06:48 +0000 (16:06 -0400)]
Fix infinite scroll in chooser. refs #2872

10 years ago2934: add "bar" repository to test fixture
Tim Pierce [Fri, 13 Jun 2014 19:08:48 +0000 (15:08 -0400)]
2934: add "bar" repository to test fixture

Add the "bar" repository to test/fixtures/repositories.yml so
CrunchDispatchTest may create a job using a commit from that
repository. (Change lost in a bad rebase.)

Refs #2934

10 years ago2934: count events and bytes in-memory
Tim Pierce [Fri, 13 Jun 2014 18:03:04 +0000 (14:03 -0400)]
2934: count events and bytes in-memory

To avoid thrashing the database, crunch-dispatch.rb counts log events
and bytes in RAM instead of reading the database each time.

Refs #2934.

10 years agoFix fuse driver tests broken by changes to test fixtures. no issue #
Peter Amstutz [Fri, 13 Jun 2014 17:31:04 +0000 (13:31 -0400)]
Fix fuse driver tests broken by changes to test fixtures.  no issue #

10 years ago2872: Merge branch '2872-folder-nav' closes #2872
Tom Clegg [Fri, 13 Jun 2014 15:12:10 +0000 (11:12 -0400)]
2872: Merge branch '2872-folder-nav' closes #2872

10 years ago2872: Add data binding for project names in dropdown.
Tom Clegg [Fri, 13 Jun 2014 14:44:42 +0000 (10:44 -0400)]
2872: Add data binding for project names in dropdown.

10 years ago2934: add launch_crunch_dispatch to integration test
Tim Pierce [Fri, 13 Jun 2014 14:44:21 +0000 (10:44 -0400)]
2934: add launch_crunch_dispatch to integration test

Added functionality for launching crunch-dispatch in
crunch_dispatch_test.rb while integration tests are running.

Refs #2934.

10 years agoMerge branch '2934-limit-crunch-logs' of git.curoverse.com:arvados into 2934-limit...
Tim Pierce [Fri, 13 Jun 2014 14:39:00 +0000 (10:39 -0400)]
Merge branch '2934-limit-crunch-logs' of git.curoverse.com:arvados into 2934-limit-crunch-logs

Fixing broken rebase

10 years ago2872: Merge branch 'master' into 2872-folder-nav
Tom Clegg [Fri, 13 Jun 2014 14:33:07 +0000 (10:33 -0400)]
2872: Merge branch 'master' into 2872-folder-nav

Conflicts:
apps/workbench/app/controllers/jobs_controller.rb

10 years agoMerge branch 'origin-2883-job-log-viewer' closes #2883
Peter Amstutz [Fri, 13 Jun 2014 14:13:39 +0000 (10:13 -0400)]
Merge branch 'origin-2883-job-log-viewer' closes #2883

10 years ago2753: Fix param name (filter -> filters).
Tom Clegg [Fri, 13 Jun 2014 14:11:26 +0000 (10:11 -0400)]
2753: Fix param name (filter -> filters).

10 years ago2883: Moved addToLogViewer function out of the template and into assets and
Peter Amstutz [Fri, 13 Jun 2014 14:10:40 +0000 (10:10 -0400)]
2883: Moved addToLogViewer function out of the template and into assets and
reformatted it properly.

10 years ago2872: Redirect to parent project after deleting a subproject.
Tom Clegg [Fri, 13 Jun 2014 14:05:15 +0000 (10:05 -0400)]
2872: Redirect to parent project after deleting a subproject.

10 years ago2872: Fix provenance graph double-smart-scroll.
Tom Clegg [Fri, 13 Jun 2014 14:01:11 +0000 (10:01 -0400)]
2872: Fix provenance graph double-smart-scroll.

10 years ago2961: Fix crash on pipeline_instances/compare.
Tom Clegg [Fri, 13 Jun 2014 13:58:01 +0000 (09:58 -0400)]
2961: Fix crash on pipeline_instances/compare.

10 years ago2872: Fix test, to match fixed fixture.
Tom Clegg [Fri, 13 Jun 2014 02:24:14 +0000 (22:24 -0400)]
2872: Fix test, to match fixed fixture.

10 years ago2872: Move project_tree code into helper_methods, fix up tests.
Tom Clegg [Fri, 13 Jun 2014 00:53:05 +0000 (20:53 -0400)]
2872: Move project_tree code into helper_methods, fix up tests.

10 years ago2872: Fix bugs, tweak formatting
Tom Clegg [Thu, 12 Jun 2014 22:03:26 +0000 (18:03 -0400)]
2872: Fix bugs, tweak formatting

10 years agoMerge branch '2879-docker-image-installer'
Brett Smith [Thu, 12 Jun 2014 19:45:36 +0000 (15:45 -0400)]
Merge branch '2879-docker-image-installer'

Refs #2879.  Closes #2998, #3006.

10 years ago2879: arv-keepdocker reports a better error for ambiguous hashes.
Brett Smith [Thu, 12 Jun 2014 19:36:18 +0000 (15:36 -0400)]
2879: arv-keepdocker reports a better error for ambiguous hashes.

Refs #2879.

10 years ago2879: Clarify Docker image search behavior in Keep installer.
Brett Smith [Thu, 12 Jun 2014 18:51:23 +0000 (14:51 -0400)]
2879: Clarify Docker image search behavior in Keep installer.

10 years ago2879: Docker Keep installer returns 0 if image already installed.
Brett Smith [Thu, 12 Jun 2014 18:44:55 +0000 (14:44 -0400)]
2879: Docker Keep installer returns 0 if image already installed.

10 years ago2879: Add arv-keepdocker command.
Brett Smith [Tue, 10 Jun 2014 20:34:01 +0000 (16:34 -0400)]
2879: Add arv-keepdocker command.

This puts a Docker image in Keep, and makes Arvados links to help find
the Collection by the image's names.

10 years ago2879: arv-put main() returns what it prints.
Brett Smith [Tue, 10 Jun 2014 15:09:42 +0000 (11:09 -0400)]
2879: arv-put main() returns what it prints.

This will enable other tools to reuse the results.

10 years ago2879: Move Python is_hex function to arvados.util.
Brett Smith [Mon, 9 Jun 2014 16:02:01 +0000 (12:02 -0400)]
2879: Move Python is_hex function to arvados.util.

10 years ago2879: Split arv-put's ArgumentParser into module segments.
Brett Smith [Mon, 9 Jun 2014 15:13:39 +0000 (11:13 -0400)]
2879: Split arv-put's ArgumentParser into module segments.

This will let us use different pieces as a parent parser for other
tools, which I plan to do for the Docker image uploader.

10 years ago2879: Factor out arv-put's cache creation to a utility library.
Brett Smith [Mon, 9 Jun 2014 15:06:20 +0000 (11:06 -0400)]
2879: Factor out arv-put's cache creation to a utility library.

This function will be useful for the Docker image uploader, and
probably other tools as well.

10 years ago2755: Merge branch '2755-require-keep-permission' refs #2755
Tom Clegg [Thu, 12 Jun 2014 19:21:59 +0000 (15:21 -0400)]
2755: Merge branch '2755-require-keep-permission' refs #2755

10 years ago2755: Fix handling of stripped/orig manifest text.
Tom Clegg [Thu, 12 Jun 2014 19:14:22 +0000 (15:14 -0400)]
2755: Fix handling of stripped/orig manifest text.

10 years ago2883: Added filtering for crunchstat, slurm log lines.
peter [Thu, 12 Jun 2014 19:11:53 +0000 (19:11 +0000)]
2883: Added filtering for crunchstat, slurm log lines.

10 years ago2755: Preserve blob signatures in manifest_text passed to collections.create.
Tom Clegg [Thu, 12 Jun 2014 19:00:13 +0000 (15:00 -0400)]
2755: Preserve blob signatures in manifest_text passed to collections.create.

10 years agoExpanded search path for cgroup stats, changed command line interface a bit.
Peter Amstutz [Thu, 12 Jun 2014 18:49:22 +0000 (14:49 -0400)]
Expanded search path for cgroup stats, changed command line interface a bit.
Also adjusted polling interval to every 10 seconds istead of every 1 second.
refs #2882

10 years agoBugfix in logging which cgroup stats files it uses. refs #2882
Peter Amstutz [Thu, 12 Jun 2014 18:18:48 +0000 (14:18 -0400)]
Bugfix in logging which cgroup stats files it uses.  refs #2882

10 years agoBugfix searching for cgroup stats files. refs #2882
Peter Amstutz [Thu, 12 Jun 2014 18:16:19 +0000 (14:16 -0400)]
Bugfix searching for cgroup stats files.  refs #2882

10 years agoCrunchstat logs where it reads its stats from. refs #2882
Peter Amstutz [Thu, 12 Jun 2014 18:04:08 +0000 (14:04 -0400)]
Crunchstat logs where it reads its stats from.  refs #2882

10 years agoRuns crunch script using "stdbuf -o0 -e0" so stdout and stderr are unbuffered,
Peter Amstutz [Thu, 12 Jun 2014 17:58:35 +0000 (13:58 -0400)]
Runs crunch script using "stdbuf -o0 -e0" so stdout and stderr are unbuffered,
solves problem of stdout showing up out of order and with incorrect time stamps
in logs.  no issue #

10 years ago2755: Fix unfinished comment.
Tom Clegg [Thu, 12 Jun 2014 17:36:10 +0000 (13:36 -0400)]
2755: Fix unfinished comment.

10 years ago2872: Fix selector in test case.
Tom Clegg [Thu, 12 Jun 2014 16:49:43 +0000 (12:49 -0400)]
2872: Fix selector in test case.

10 years ago2872: Add "move to project" button, fix "copy to project" behavior
Tom Clegg [Thu, 12 Jun 2014 15:36:21 +0000 (11:36 -0400)]
2872: Add "move to project" button, fix "copy to project" behavior
(really copy, instead of adding a link).

10 years ago2872: Fix "remove" icon and pencil icon placement.
Tom Clegg [Thu, 12 Jun 2014 15:35:28 +0000 (11:35 -0400)]
2872: Fix "remove" icon and pencil icon placement.

10 years ago2872: Muster all the "move" and "add" buttons up to the right side of the tabs.
Tom Clegg [Thu, 12 Jun 2014 15:30:25 +0000 (11:30 -0400)]
2872: Muster all the "move" and "add" buttons up to the right side of the tabs.

10 years ago2872: Show projectless jobs/pipelines in "recent" list too.
Tom Clegg [Thu, 12 Jun 2014 15:29:01 +0000 (11:29 -0400)]
2872: Show projectless jobs/pipelines in "recent" list too.

10 years agoMade a note about user how permissions are applied when attempting to create a
Peter Amstutz [Thu, 12 Jun 2014 15:14:03 +0000 (11:14 -0400)]
Made a note about user how permissions are applied when attempting to create a
token for another user.  Test for this case already exists.  closes #2350.

10 years ago2872: Fix tests broken in merge.
Tom Clegg [Thu, 12 Jun 2014 14:40:00 +0000 (10:40 -0400)]
2872: Fix tests broken in merge.

10 years ago2934: add limits for crunch job log generation.
Tim Pierce [Tue, 10 Jun 2014 14:37:35 +0000 (10:37 -0400)]
2934: add limits for crunch job log generation.

* crunch_limit_log_events_per_job
* crunch_limit_log_event_bytes_per_job

  Limit the number of events a job may log, and the total number of
  bytes a job may log.

* crunch_log_bytes_per_event
* crunch_log_seconds_between_events

  Set minimum logging thresholds: event logs will only be flushed to the
  database when at least crunch_log_bytes_per_event have been generated,
  or crunch_log_seconds_between_events have passed.

Integration test CrunchDispatchTest exercised creating a job.

Refs #2934.

10 years agoMerge branch 'origin-2882-job-process-stats' refs #2882
Peter Amstutz [Thu, 12 Jun 2014 14:23:42 +0000 (10:23 -0400)]
Merge branch 'origin-2882-job-process-stats' refs #2882

10 years ago2882: Search subdirectories of cgroup for stats, because compute0 has a
Peter Amstutz [Thu, 12 Jun 2014 14:19:18 +0000 (10:19 -0400)]
2882: Search subdirectories of cgroup for stats, because compute0 has a
slightly different cgroup layout from what's on my workstation (wtf?).

10 years ago2883: Removed commented out code related to live loading (saved it to another branch).
Peter Amstutz [Thu, 12 Jun 2014 13:56:52 +0000 (09:56 -0400)]
2883: Removed commented out code related to live loading (saved it to another branch).

10 years ago2872: Merge branch 'master' into 2872-folder-nav
Tom Clegg [Thu, 12 Jun 2014 03:57:37 +0000 (23:57 -0400)]
2872: Merge branch 'master' into 2872-folder-nav

Conflicts:
apps/workbench/app/assets/javascripts/pipeline_instances.js
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/controllers/collections_controller.rb
apps/workbench/app/controllers/jobs_controller.rb
apps/workbench/app/helpers/application_helper.rb
apps/workbench/app/models/job.rb
apps/workbench/app/views/application/_content.html.erb
apps/workbench/app/views/application/_show_metadata.html.erb
apps/workbench/app/views/pipeline_instances/_show_components.html.erb

10 years ago2872: Fix bookmark bar causing spurious window width.
Tom Clegg [Thu, 12 Jun 2014 03:31:41 +0000 (23:31 -0400)]
2872: Fix bookmark bar causing spurious window width.

10 years ago2883: Adjusted task type column width. Commented out code for working with
peter [Thu, 12 Jun 2014 02:22:44 +0000 (02:22 +0000)]
2883: Adjusted task type column width.  Commented out code for working with
live-updating logs, it almost works but there are some complications.

10 years ago2755: Add api server config to enable mandatory Keep signatures.
Tom Clegg [Thu, 12 Jun 2014 02:18:24 +0000 (22:18 -0400)]
2755: Add api server config to enable mandatory Keep signatures.

10 years ago2883: Adjust timestamp display based on timezone and locale.
peter [Thu, 12 Jun 2014 01:59:12 +0000 (01:59 +0000)]
2883: Adjust timestamp display based on timezone and locale.

10 years ago2883: Live updating log wip
Peter Amstutz [Wed, 11 Jun 2014 21:12:15 +0000 (21:12 +0000)]
2883: Live updating log wip

10 years ago2883: Styling column widths so they don't jump around when filters are turned
Peter Amstutz [Wed, 11 Jun 2014 20:13:22 +0000 (20:13 +0000)]
2883: Styling column widths so they don't jump around when filters are turned
on and off.

10 years ago2883: Moved hardcoded styles out into a stylesheet.
Peter Amstutz [Wed, 11 Jun 2014 20:02:12 +0000 (20:02 +0000)]
2883: Moved hardcoded styles out into a stylesheet.

10 years ago2883: Log viewer works, supports sorting and filtering.
Peter Amstutz [Wed, 11 Jun 2014 19:38:44 +0000 (19:38 +0000)]
2883: Log viewer works, supports sorting and filtering.

10 years agorefs #2871
radhika [Wed, 11 Jun 2014 16:30:24 +0000 (12:30 -0400)]
refs #2871
Merge branch '2871-preload-objects'

10 years ago2871: fix the typo caught by integration test
radhika [Wed, 11 Jun 2014 16:22:32 +0000 (12:22 -0400)]
2871: fix the typo caught by integration test

10 years agocloses #2871
radhika [Wed, 11 Jun 2014 15:02:21 +0000 (11:02 -0400)]
closes #2871
Merge branch '2871-preload-objects'

10 years ago2883: Initial work on fetching and parsing job log
Peter Amstutz [Wed, 11 Jun 2014 02:09:20 +0000 (22:09 -0400)]
2883: Initial work on fetching and parsing job log

10 years agoBugfix: the discovery doc should not clobber defaults values with the
Ward Vandewege [Tue, 10 Jun 2014 20:31:59 +0000 (16:31 -0400)]
Bugfix: the discovery doc should not clobber defaults values with the
word 'string'. Instead, make sure the default values are always exposed
as a string, which is something the java google apiclient is sensitive
to.

Refs no issue #

10 years agoAdded error-handler for x-editable that extracts Arvados API error field for
Peter Amstutz [Tue, 10 Jun 2014 20:04:56 +0000 (16:04 -0400)]
Added error-handler for x-editable that extracts Arvados API error field for
display, closes #2819

10 years ago2871: add andand to prevent error
radhika [Tue, 10 Jun 2014 20:02:02 +0000 (16:02 -0400)]
2871: add andand to prevent error

10 years agoMerge branch 'master' into 2871-preload-objects
radhika [Tue, 10 Jun 2014 19:56:07 +0000 (15:56 -0400)]
Merge branch 'master' into 2871-preload-objects

10 years agoMerge branch '2961-load-tab-partials' closes #2961
Peter Amstutz [Tue, 10 Jun 2014 19:46:42 +0000 (15:46 -0400)]
Merge branch '2961-load-tab-partials' closes #2961

10 years agoarv-run-pipeline-instance should not keep trying to create jobs when the
Ward Vandewege [Tue, 10 Jun 2014 18:59:21 +0000 (14:59 -0400)]
arv-run-pipeline-instance should not keep trying to create jobs when the
API server returns an error on job creation.

This closes #3005

10 years agoMerge branch '2826-simple-go-sdk' closes #2826
Peter Amstutz [Tue, 10 Jun 2014 18:56:01 +0000 (14:56 -0400)]
Merge branch '2826-simple-go-sdk' closes #2826

10 years agoFix inconsistent JSON error return behavior on job create.
Ward Vandewege [Tue, 10 Jun 2014 18:32:09 +0000 (14:32 -0400)]
Fix inconsistent JSON error return behavior on job create.

refs #3004

10 years agoMerge branch '2880-crunch-dispatch-node-constraints'
Brett Smith [Tue, 10 Jun 2014 18:12:31 +0000 (14:12 -0400)]
Merge branch '2880-crunch-dispatch-node-constraints'

Closes #2880, #2976, #2993.

10 years ago2880: Don't dispatch Jobs until runtime constraints are met.
Brett Smith [Fri, 6 Jun 2014 17:18:38 +0000 (13:18 -0400)]
2880: Don't dispatch Jobs until runtime constraints are met.

This retains the same FIFO approach to the Job queue that
crunch-dispatch currently uses, but now when it encounters a Job whose
constraints are not met:

* it may wait for a while to see if the Node Manager makes Nodes
  available, if it hasn't done that this hour; and

* it leaves that Job in the queue and tries to process the next one.

See #2880 for further background.  The exact parameters of "waiting
for Nodes" will probably need tuning, but that will be easier to do
after it's been in production for a while.

10 years ago2880: Improve error reporting when crunch-dispatch updates node status.
Brett Smith [Fri, 6 Jun 2014 16:03:54 +0000 (12:03 -0400)]
2880: Improve error reporting when crunch-dispatch updates node status.

10 years ago2880: crunch-dispatch must stop putting symbols in the database.
Brett Smith [Fri, 6 Jun 2014 16:03:08 +0000 (12:03 -0400)]
2880: crunch-dispatch must stop putting symbols in the database.

10 years ago2961: Removed calls to wait_for_ajax, fixes user tests.
Peter Amstutz [Tue, 10 Jun 2014 17:31:46 +0000 (13:31 -0400)]
2961: Removed calls to wait_for_ajax, fixes user tests.

10 years ago2961: user-setup-modal-window div is no longer in footer_html because it is
Peter Amstutz [Tue, 10 Jun 2014 17:28:13 +0000 (13:28 -0400)]
2961: user-setup-modal-window div is no longer in footer_html because it is
loaded using AJAX.

10 years ago2961: Don't call #render_index from #index on folders_controller because #index
Peter Amstutz [Tue, 10 Jun 2014 17:26:20 +0000 (13:26 -0400)]
2961: Don't call #render_index from #index on folders_controller because #index
is also used by #choose and the index does not have any tabs.

10 years ago2961: Do not include meta tag for websockets if there is no websockets in the
Peter Amstutz [Tue, 10 Jun 2014 17:23:24 +0000 (13:23 -0400)]
2961: Do not include meta tag for websockets if there is no websockets in the
discovery document.

10 years ago2961: Fixed name of collection on collection show page to fix test.
Peter Amstutz [Tue, 10 Jun 2014 17:22:48 +0000 (13:22 -0400)]
2961: Fixed name of collection on collection show page to fix test.

10 years ago2961: Track valid/up to date state for each panel, only reload panels when they
Peter Amstutz [Tue, 10 Jun 2014 14:20:29 +0000 (10:20 -0400)]
2961: Track valid/up to date state for each panel, only reload panels when they
are out of date (based on event log) and visible to user.

10 years ago2961: Added use count so ajax loading icon is accurate when there are multiple
Peter Amstutz [Tue, 10 Jun 2014 14:18:22 +0000 (10:18 -0400)]
2961: Added use count so ajax loading icon is accurate when there are multiple
outstanding ajax requests.

10 years ago2961: Removed dangling close div.
Peter Amstutz [Tue, 10 Jun 2014 14:16:04 +0000 (10:16 -0400)]
2961: Removed dangling close div.

10 years ago2961: Added missing user uuid to session.
Peter Amstutz [Tue, 10 Jun 2014 14:15:34 +0000 (10:15 -0400)]
2961: Added missing user uuid to session.

10 years agoMerge branch 'master' into 2961-load-tab-partials
Peter Amstutz [Tue, 10 Jun 2014 13:21:02 +0000 (09:21 -0400)]
Merge branch 'master' into 2961-load-tab-partials

10 years agoFix for running workbench against server that doesn't have 'Job.supplied_script_versi...
Peter Amstutz [Tue, 10 Jun 2014 13:19:39 +0000 (09:19 -0400)]
Fix for running workbench against server that doesn't have 'Job.supplied_script_version' yet.  refs #2939

10 years ago2961: Job index needs to call super sometimes, render_index other times.
Peter Amstutz [Tue, 10 Jun 2014 13:18:02 +0000 (09:18 -0400)]
2961: Job index needs to call super sometimes, render_index other times.

10 years ago2961: Changed index methods on some controllers to use render_index instead of
Peter Amstutz [Tue, 10 Jun 2014 13:08:38 +0000 (09:08 -0400)]
2961: Changed index methods on some controllers to use render_index instead of
super, to skip the default index query logic but still apply the tab partial
logic.

10 years agoMerge branch 'master' into 2871-preload-objects
radhika [Tue, 10 Jun 2014 12:58:22 +0000 (08:58 -0400)]
Merge branch 'master' into 2871-preload-objects

10 years ago2871: trailing whitespace
radhika [Tue, 10 Jun 2014 12:49:39 +0000 (08:49 -0400)]
2871: trailing whitespace

10 years agoSpecify server-side keep-alive ping interval for websockets. no issue #
Peter Amstutz [Mon, 9 Jun 2014 21:05:43 +0000 (17:05 -0400)]
Specify server-side keep-alive ping interval for websockets.  no issue #

10 years ago2961: Escaped erb used embedded in javascript. Updated comments in
Peter Amstutz [Mon, 9 Jun 2014 20:57:50 +0000 (16:57 -0400)]
2961: Escaped erb used embedded in javascript.  Updated comments in
event_log.js.  Removed debug put from ApplicationController.

10 years agoMerge branch 'master' into 2871-preload-objects
radhika [Mon, 9 Jun 2014 20:40:39 +0000 (16:40 -0400)]
Merge branch 'master' into 2871-preload-objects

10 years ago2871: test preload_objects_for_dataclass helper method
radhika [Mon, 9 Jun 2014 20:39:31 +0000 (16:39 -0400)]
2871: test preload_objects_for_dataclass helper method

10 years agoAdd puma to the Gemfile for the API server; we use it for the websockets
Ward Vandewege [Mon, 9 Jun 2014 20:33:01 +0000 (16:33 -0400)]
Add puma to the Gemfile for the API server; we use it for the websockets
server.

no issue #

10 years ago2871: preload_log_collections tests
radhika [Mon, 9 Jun 2014 19:37:39 +0000 (15:37 -0400)]
2871: preload_log_collections tests

10 years ago2871: more testing
radhika [Mon, 9 Jun 2014 18:00:53 +0000 (14:00 -0400)]
2871: more testing