arvados.git
10 years ago3453: Rename check_project_exists to desired_project_uuid. Now raises and
Peter Amstutz [Tue, 9 Sep 2014 15:53:48 +0000 (11:53 -0400)]
3453: Rename check_project_exists to desired_project_uuid.  Now raises and
catches distinct apiclient.errors.Error, ValueError errors for project not
found or invalid uuid.

10 years ago3453: Refactored arv-put to remove support for name links, correctly use
Peter Amstutz [Mon, 8 Sep 2014 20:54:49 +0000 (16:54 -0400)]
3453: Refactored arv-put to remove support for name links, correctly use
ensure_name_unique to prevent name collisions.  arv-keepdocker should now
correctly handle cases where the user provides a image hash instead of
repository/tag. Fixed tests.

10 years ago3453: Add ensure_unique_name=True to collection create.
Peter Amstutz [Mon, 8 Sep 2014 14:56:19 +0000 (10:56 -0400)]
3453: Add ensure_unique_name=True to collection create.

10 years agoMerge branch 'master' into 3453-arv-list-docker-images
Peter Amstutz [Mon, 8 Sep 2014 14:53:52 +0000 (10:53 -0400)]
Merge branch 'master' into 3453-arv-list-docker-images

10 years agoAdded create#ensure_unique_name to discovery document. "Add a subproject"
Peter Amstutz [Mon, 8 Sep 2014 14:53:32 +0000 (10:53 -0400)]
Added create#ensure_unique_name to discovery document.  "Add a subproject"
button now uses "ensure_unique_name" to avoid errors when the user creates more
than one project called "New project".  refs #3822

10 years ago3453: Create links and collection objects in the specified project, even if
Peter Amstutz [Mon, 8 Sep 2014 14:43:49 +0000 (10:43 -0400)]
3453: Create links and collection objects in the specified project, even if
the docker image has already been uploaded to some other project.

10 years agoUpdated Gemfile again with published package version. refs #3822
Peter Amstutz [Fri, 5 Sep 2014 21:02:20 +0000 (17:02 -0400)]
Updated Gemfile again with published package version.  refs #3822

10 years agoMerge branch '3822-ensure-unique-names' refs #3822
Peter Amstutz [Fri, 5 Sep 2014 20:52:59 +0000 (16:52 -0400)]
Merge branch '3822-ensure-unique-names' refs #3822

Conflicts:
services/api/Gemfile
services/api/Gemfile.lock

10 years ago3822: Updated Gemfile
Peter Amstutz [Fri, 5 Sep 2014 20:48:25 +0000 (16:48 -0400)]
3822: Updated Gemfile

10 years ago3822: Fixed use of string instead of symbol in hash, added missing list separator.
Peter Amstutz [Fri, 5 Sep 2014 20:46:26 +0000 (16:46 -0400)]
3822: Fixed use of string instead of symbol in hash, added missing list separator.

10 years ago3822: Added 'ensure_unique_name' option to #create method for API server to
Peter Amstutz [Fri, 5 Sep 2014 20:23:38 +0000 (16:23 -0400)]
3822: Added 'ensure_unique_name' option to #create method for API server to
choose a unique name when there is a name collision in the database.
arv-run-pipeline-instance checks to see if there is an output file with the
same name and contents, and uses 'ensure_unique_name' when creating collection.

10 years agoReplace all remaining references to Clinical Future with Curoverse.
Ward Vandewege [Fri, 5 Sep 2014 17:18:28 +0000 (13:18 -0400)]
Replace all remaining references to Clinical Future with Curoverse.

no issue #

10 years ago3720: Update arvados Gem versions.
Brett Smith [Fri, 5 Sep 2014 15:57:07 +0000 (11:57 -0400)]
3720: Update arvados Gem versions.

Gemfiles need to be in sync with the latest commit on master.
Refs #3720.

10 years agoMerge branch '3720-big-manifest-performance-wip'
Brett Smith [Fri, 5 Sep 2014 15:39:28 +0000 (11:39 -0400)]
Merge branch '3720-big-manifest-performance-wip'

Closes #3720, #3806.

10 years ago3720: Limit Workbench file rendering for large Collections.
Brett Smith [Wed, 3 Sep 2014 21:52:00 +0000 (17:52 -0400)]
3720: Limit Workbench file rendering for large Collections.

Rendering too many files can cause rendering to take too long, and
there's not much point because it can really strain browsers too.
Arbitrarily cap rendering at 10,000 files.

10 years ago3720: Refactor manifest parsing from API server to Ruby SDK.
Brett Smith [Fri, 29 Aug 2014 21:37:13 +0000 (17:37 -0400)]
3720: Refactor manifest parsing from API server to Ruby SDK.

To date, the API server has been parsing manifests and returning
parsed information in the files attribute.  That's convenient, but
causes performance problems in large Collections.  Profiling indicates
that most of the API server's response time is spent in the
as_api_response method; rendering the same information twice really
hurts.

This commits removes the API server's need to always parse manifests,
and moves the parsing code to the Ruby SDK.  Both the API server and
Workbench use this Gem to parse manifests on an as-needed basis.
This, combined with improvements to the new Keep::Manifest class, lays
the groundwork for future performance gains.

10 years ago3720: arvados-cli Gemfile refers to gemspec.
Brett Smith [Wed, 3 Sep 2014 21:11:51 +0000 (17:11 -0400)]
3720: arvados-cli Gemfile refers to gemspec.

This change helps avoid loops where you have to have arvados-cli
installed to build arvados-cli.

10 years ago3720: Clean up+skip Ruby SDK tests.
Brett Smith [Wed, 3 Sep 2014 18:57:25 +0000 (14:57 -0400)]
3720: Clean up+skip Ruby SDK tests.

First I changed these to get them passing again.  With that done, I
added the skip.  We're not currently running these tests, and getting
them going the right way again (e.g., with run_test_server.py or
mocks) is out of scope for my current task.

10 years ago3453: Now lists images by default if called with no parameters. Fixed reported
Peter Amstutz [Fri, 5 Sep 2014 14:16:17 +0000 (10:16 -0400)]
3453: Now lists images by default if called with no parameters.  Fixed reported
timestamps on images without a 'timestamp' property.  Added 'Docker image'
prefix to default name.  Renamed variables in list_images_in_arv() to be more
friendly.

10 years agoMerge branch '3710-combine-selections-bug' refs #3710
Peter Amstutz [Fri, 5 Sep 2014 13:18:06 +0000 (09:18 -0400)]
Merge branch '3710-combine-selections-bug' refs #3710

10 years ago3710: Refactored code to reduce redundancy. Use select() to get the manifest
Peter Amstutz [Fri, 5 Sep 2014 13:15:48 +0000 (09:15 -0400)]
3710: Refactored code to reduce redundancy.  Use select() to get the manifest
text instead of reloading each object for performance.

10 years agoRemove name and description columns on jobs table introduced accidentally
Peter Amstutz [Fri, 5 Sep 2014 01:10:59 +0000 (21:10 -0400)]
Remove name and description columns on jobs table introduced accidentally
(refs #3036).  Fixed workbench so tests pass.

10 years ago3710: handle the scenario where files from named collections are selected
radhika [Thu, 4 Sep 2014 20:55:36 +0000 (16:55 -0400)]
3710: handle the scenario where files from named collections are selected

10 years ago3704: Treat project filters consistently in Workbench chooser.
Brett Smith [Thu, 4 Sep 2014 20:05:57 +0000 (16:05 -0400)]
3704: Treat project filters consistently in Workbench chooser.

Before this, a chooser that was loaded on a specific project would
return empty results if the user selected a different project.  This
is because it would search for items with two different owner_uuids,
both the project selected at load time, and the project the user
selected later.  This patch fixes that by separating the project
filter from other filters, and preseeding it in the same place where
it's updated by the project selection AJAX.  Closes #3704, #3778.

10 years ago3710: update the combine_selected_files_into_collection method to also handle the...
radhika [Thu, 4 Sep 2014 18:06:34 +0000 (14:06 -0400)]
3710: update the combine_selected_files_into_collection method to also handle the scenarios where a collection uuid or "collection uuid/filename" is passed.

10 years agoRevert 2 hunks from a5819ec1e48fba90658fcf676ffc50c1f216d484, thus
Ward Vandewege [Thu, 4 Sep 2014 15:33:36 +0000 (11:33 -0400)]
Revert 2 hunks from a5819ec1e48fba90658fcf676ffc50c1f216d484, thus
un-breaking crunch-job in two important ways:

* task stdout and stderr are propagated again

* tasks can actually run because crunch-src is available in the docker
  container again

no issue #

10 years agocloses #3637
radhika [Wed, 3 Sep 2014 16:48:17 +0000 (12:48 -0400)]
closes #3637
Merge branch '3637-copy-selections'

10 years ago3637: add one more test that verifies that the copy action is disabled when a subproj...
radhika [Wed, 3 Sep 2014 16:14:03 +0000 (12:14 -0400)]
3637: add one more test that verifies that the copy action is disabled when a subproject under a project is selected.

10 years agoMerge branch 'master' into 3637-copy-selections
radhika [Tue, 2 Sep 2014 22:36:21 +0000 (18:36 -0400)]
Merge branch 'master' into 3637-copy-selections

10 years ago3637: remove unwanted tab chars
radhika [Tue, 2 Sep 2014 22:26:42 +0000 (18:26 -0400)]
3637: remove unwanted tab chars

10 years ago3637: add integration tests for "copy", "move", and "remove" operations from the...
radhika [Tue, 2 Sep 2014 22:16:46 +0000 (18:16 -0400)]
3637: add integration tests for "copy", "move", and "remove" operations from the project selection dropdown.

10 years agoAdd name and description columns back in for jobs. refs #3036
Peter Amstutz [Tue, 2 Sep 2014 20:35:23 +0000 (16:35 -0400)]
Add name and description columns back in for jobs.  refs #3036

10 years agoDelete names and description columns from jobs that shouldn't be there. Delete
Peter Amstutz [Tue, 2 Sep 2014 19:59:51 +0000 (15:59 -0400)]
Delete names and description columns from jobs that shouldn't be there.  Delete
jobs_owner_uuid_name_unique and pipeline_instance_owner_uuid_name_unique
indexes added by mistake.  refs #3036.

10 years ago3637: copy selected items
radhika [Tue, 2 Sep 2014 19:26:59 +0000 (15:26 -0400)]
3637: copy selected items

10 years ago3453: Add support for --images to get a list of available images. Add support
Peter Amstutz [Tue, 2 Sep 2014 18:56:07 +0000 (14:56 -0400)]
3453: Add support for --images to get a list of available images.  Add support
for --project-uuid to place the image and tags in the specified project.  Set a
more useful name for the collection containing the image.

10 years agoMerge branch 'master' into 3637-copy-selections
radhika [Tue, 2 Sep 2014 18:43:15 +0000 (14:43 -0400)]
Merge branch 'master' into 3637-copy-selections

Conflicts:
apps/workbench/app/views/application/_choose.js.erb
apps/workbench/config/routes.rb

10 years ago3637: undo some of the changes to absorb Tom's updates to chooser implementation
radhika [Tue, 2 Sep 2014 18:26:03 +0000 (14:26 -0400)]
3637: undo some of the changes to absorb Tom's updates to chooser implementation

10 years agoDo not blow up when running jobs in local mode.
Ward Vandewege [Tue, 2 Sep 2014 17:55:39 +0000 (13:55 -0400)]
Do not blow up when running jobs in local mode.

This bug was introduced in a5819ec1e48fba90658fcf676ffc50c1f216d484

no issue #

10 years agorefs #3637 - merge Tom's updates to chooser implementation, where selected items...
radhika [Tue, 2 Sep 2014 17:51:26 +0000 (13:51 -0400)]
refs #3637 - merge Tom's updates to chooser implementation, where selected items are passed as parameters.
Merge branch '3637-selection-through-chooser'

10 years agoMerge branch '3704-broken-filters-param'
Brett Smith [Tue, 2 Sep 2014 13:19:03 +0000 (09:19 -0400)]
Merge branch '3704-broken-filters-param'

Unfortunately, this does not completely fix the bug, but at least it's
an improvement.  See refs #3704 for more discussion.  Closes #3777.

10 years agocrunchstat: fix typos in comments and help/error text.
Ward Vandewege [Mon, 1 Sep 2014 21:47:43 +0000 (17:47 -0400)]
crunchstat: fix typos in comments and help/error text.

no issue #

10 years agoDo not blow up when arv is called with an unrecognized argument.
Ward Vandewege [Mon, 1 Sep 2014 18:05:38 +0000 (14:05 -0400)]
Do not blow up when arv is called with an unrecognized argument.

Calling option_parser.educate suffices, no need for a call to
Trollop::die that fails and throws a stacktrace.

no issue #

10 years ago3637: Propagate checkbox selection through chooser modal, remove session hack.
Tom Clegg [Sat, 30 Aug 2014 00:06:01 +0000 (20:06 -0400)]
3637: Propagate checkbox selection through chooser modal, remove session hack.

10 years ago3637: Operate only on selections within this container, even if clippy has more.
Tom Clegg [Sat, 30 Aug 2014 00:02:38 +0000 (20:02 -0400)]
3637: Operate only on selections within this container, even if clippy has more.

10 years ago3704: Force params[:filters] into native format so views and helpers can use it.
Tom Clegg [Fri, 29 Aug 2014 21:54:36 +0000 (17:54 -0400)]
3704: Force params[:filters] into native format so views and helpers can use it.

10 years agoMerge branch '3763-move-collections-error' closes #3763
Peter Amstutz [Fri, 29 Aug 2014 16:37:12 +0000 (12:37 -0400)]
Merge branch '3763-move-collections-error' closes #3763

10 years ago3763: Workbench will not send attributes to API server that are nil and not
Peter Amstutz [Fri, 29 Aug 2014 14:17:10 +0000 (10:17 -0400)]
3763: Workbench will not send attributes to API server that are nil and not
changed.

10 years agocloses #3714
radhika [Thu, 28 Aug 2014 20:21:58 +0000 (16:21 -0400)]
closes #3714
Merge branch '3714-report-issue-issues'

10 years agoMerge branch 'master' into 3714-report-issue-issues
radhika [Thu, 28 Aug 2014 20:21:22 +0000 (16:21 -0400)]
Merge branch 'master' into 3714-report-issue-issues

10 years ago3637: fix test now that "Copy selections" and "Move selections" options are no longer...
radhika [Thu, 28 Aug 2014 20:19:57 +0000 (16:19 -0400)]
3637: fix test now that "Copy selections" and "Move selections" options are no longer available in clippy.

10 years ago3637: remove "Copy selections" and "Move selections" options from clippy in topnav.
radhika [Thu, 28 Aug 2014 20:09:11 +0000 (16:09 -0400)]
3637: remove "Copy selections" and "Move selections" options from clippy in topnav.

10 years agoMerge branch 'master' into 3637-copy-selections
radhika [Thu, 28 Aug 2014 20:05:28 +0000 (16:05 -0400)]
Merge branch 'master' into 3637-copy-selections

10 years ago3714: minor updates from review feedback
radhika [Thu, 28 Aug 2014 20:03:04 +0000 (16:03 -0400)]
3714: minor updates from review feedback

10 years agoMerge branch 'master' into 3714-report-issue-issues
radhika [Thu, 28 Aug 2014 19:39:32 +0000 (15:39 -0400)]
Merge branch 'master' into 3714-report-issue-issues

10 years ago3637: refactor code for better maintenance.
radhika [Thu, 28 Aug 2014 19:38:35 +0000 (15:38 -0400)]
3637: refactor code for better maintenance.

10 years agoFix arv-put tests refs #3709
Peter Amstutz [Thu, 28 Aug 2014 19:25:35 +0000 (15:25 -0400)]
Fix arv-put tests refs #3709

10 years agoMerge branch 'master' into 3637-copy-selections
radhika [Thu, 28 Aug 2014 19:20:03 +0000 (15:20 -0400)]
Merge branch 'master' into 3637-copy-selections

10 years ago3637: add copy selected items functionality to project selection dropdown.
radhika [Thu, 28 Aug 2014 19:19:05 +0000 (15:19 -0400)]
3637: add copy selected items functionality to project selection dropdown.

10 years agoMerge branch '3719-improve-subst-error-reporting' closes #3719
Peter Amstutz [Thu, 28 Aug 2014 18:49:12 +0000 (14:49 -0400)]
Merge branch '3719-improve-subst-error-reporting' closes #3719

10 years ago3719: Python style/wording fixes.
Peter Amstutz [Thu, 28 Aug 2014 18:48:49 +0000 (14:48 -0400)]
3719: Python style/wording fixes.

10 years agoMerge branch '3709-arv-put-print-uuid' closes #3709
Peter Amstutz [Thu, 28 Aug 2014 18:42:03 +0000 (14:42 -0400)]
Merge branch '3709-arv-put-print-uuid' closes #3709

10 years agoFix nil dereference causing a fiddlesticks on the collections index page. no issue #
Peter Amstutz [Thu, 28 Aug 2014 17:58:24 +0000 (13:58 -0400)]
Fix nil dereference causing a fiddlesticks on the collections index page.  no issue #

10 years agoMerge branch 'master' into 3709-arv-put-print-uuid
Peter Amstutz [Thu, 28 Aug 2014 17:35:12 +0000 (13:35 -0400)]
Merge branch 'master' into 3709-arv-put-print-uuid

10 years agoComplain and fail if exec() returns. No issue #
Tom Clegg [Thu, 28 Aug 2014 17:33:28 +0000 (13:33 -0400)]
Complain and fail if exec() returns. No issue #

10 years agoPass stdin to child process. closes #3751
Tom Clegg [Thu, 28 Aug 2014 17:18:48 +0000 (13:18 -0400)]
Pass stdin to child process. closes #3751

10 years ago3709: arv-put now prints collection uuid by default. Add --portable-data-hash
Peter Amstutz [Thu, 28 Aug 2014 15:20:35 +0000 (11:20 -0400)]
3709: arv-put now prints collection uuid by default.  Add --portable-data-hash
to arv-put to get the old behavior (print PDH).  Crunch-job uses arv-put
--portable-data-hash to get the PDH to put in the log field.  Crunch-job logs
both PDH and collection UUID.

10 years agoRun given command even if src tree already installed. No issue #
Tom Clegg [Thu, 28 Aug 2014 15:06:38 +0000 (11:06 -0400)]
Run given command even if src tree already installed. No issue #

10 years ago3719: Robust-put uses run-command logger.
Peter Amstutz [Thu, 28 Aug 2014 14:06:37 +0000 (10:06 -0400)]
3719: Robust-put uses run-command logger.

10 years ago3719: run-command uses its own logger instead of the default Python logger to
Peter Amstutz [Thu, 28 Aug 2014 14:02:15 +0000 (10:02 -0400)]
3719: run-command uses its own logger instead of the default Python logger to
avoid cross talk with badly behaved modules.

10 years agocloses #3339
radhika [Thu, 28 Aug 2014 14:02:14 +0000 (10:02 -0400)]
closes #3339
Merge branch '3339-truncate-project-descriptions'

10 years ago3339: fix typo in test
radhika [Thu, 28 Aug 2014 14:01:38 +0000 (10:01 -0400)]
3339: fix typo in test

10 years agoMerge branch 'master' into 3339-truncate-project-descriptions
radhika [Thu, 28 Aug 2014 13:48:47 +0000 (09:48 -0400)]
Merge branch 'master' into 3339-truncate-project-descriptions

10 years agoRemove assertion testing for obsolete output_is_persistent field. refs #3342
Peter Amstutz [Thu, 28 Aug 2014 13:30:25 +0000 (09:30 -0400)]
Remove assertion testing for obsolete output_is_persistent field.  refs #3342

10 years agoMerge branch 'master' into 3339-truncate-project-descriptions
radhika [Thu, 28 Aug 2014 13:29:21 +0000 (09:29 -0400)]
Merge branch 'master' into 3339-truncate-project-descriptions

10 years ago3719: Raise more specific SubstitutionError instead of generic exception on
Peter Amstutz [Thu, 28 Aug 2014 13:25:52 +0000 (09:25 -0400)]
3719: Raise more specific SubstitutionError instead of generic exception on
user syntax errors.  Don't print stack trace on SubstitutionError.

10 years ago3714: update tests to verify that the send report button is disabled until problem...
radhika [Thu, 28 Aug 2014 13:22:00 +0000 (09:22 -0400)]
3714: update tests to verify that the send report button is disabled until problem description is entered.

10 years agoMerge branch 'master' into 3714-report-issue-issues
radhika [Thu, 28 Aug 2014 13:17:06 +0000 (09:17 -0400)]
Merge branch 'master' into 3714-report-issue-issues

10 years agoSet Gemfile version target for arvados-cli to correct version. refs #3342
Peter Amstutz [Thu, 28 Aug 2014 12:53:12 +0000 (08:53 -0400)]
Set Gemfile version target for arvados-cli to correct version.  refs #3342

10 years ago3339: some refactoring of the render textile impl. improve the test that verifies...
radhika [Thu, 28 Aug 2014 12:05:49 +0000 (08:05 -0400)]
3339: some refactoring of the render textile impl. improve the test that verifies project description.

10 years agoRevert arvados gems to versions that actually exist. refs #3342
Tom Clegg [Wed, 27 Aug 2014 21:44:20 +0000 (17:44 -0400)]
Revert arvados gems to versions that actually exist. refs #3342

10 years ago3714: disable submit button until problem description is entered.
radhika [Wed, 27 Aug 2014 21:21:19 +0000 (17:21 -0400)]
3714: disable submit button until problem description is entered.

10 years agoMerge branch '3342-pipeline-output-current-project' closes #3342
Peter Amstutz [Wed, 27 Aug 2014 21:04:24 +0000 (17:04 -0400)]
Merge branch '3342-pipeline-output-current-project' closes #3342

10 years ago3342: Fix syntax error in pipeline_instance.rb. Restore code in crunch-job
Peter Amstutz [Wed, 27 Aug 2014 21:03:58 +0000 (17:03 -0400)]
3342: Fix syntax error in pipeline_instance.rb.  Restore code in crunch-job
that reads manifest text from arv-get pipe.

10 years agoMerge branch '3414-keep-pull-handler'
Tim Pierce [Wed, 27 Aug 2014 20:59:11 +0000 (16:59 -0400)]
Merge branch '3414-keep-pull-handler'

Closes #3414.

10 years ago3414: fix log typo
Tim Pierce [Wed, 27 Aug 2014 20:56:17 +0000 (16:56 -0400)]
3414: fix log typo

%s -> %v

10 years ago3342: Handle case in PipelineInstance#friendly_link_name where
Peter Amstutz [Wed, 27 Aug 2014 19:02:20 +0000 (15:02 -0400)]
3342: Handle case in PipelineInstance#friendly_link_name where
pipeline_template_uuid doesn't return a PipelineTemplate.  Removed unnecessary
code from crunch-job to calculate md5 hash of manifest_text (API server doesn't
require md5 hash to be provided with collection creation any more.)

10 years ago3339: update test to verify textile description in my projects panel in dashboard.
radhika [Wed, 27 Aug 2014 18:24:33 +0000 (14:24 -0400)]
3339: update test to verify textile description in my projects panel in dashboard.

10 years ago3339: render truncated textile descriptions in dashboard
radhika [Wed, 27 Aug 2014 16:30:53 +0000 (12:30 -0400)]
3339: render truncated textile descriptions in dashboard

10 years ago3414: update comment for code review
Tim Pierce [Wed, 27 Aug 2014 15:50:39 +0000 (11:50 -0400)]
3414: update comment for code review

10 years ago3342: Update documentation. Add "output_name", remove "output_is_persistent".
Peter Amstutz [Wed, 27 Aug 2014 14:38:08 +0000 (10:38 -0400)]
3342: Update documentation.  Add "output_name", remove "output_is_persistent".

10 years ago3342: Tweak pipeline component status rendering. Support "output_name":false
Peter Amstutz [Wed, 27 Aug 2014 13:33:07 +0000 (09:33 -0400)]
3342: Tweak pipeline component status rendering.  Support "output_name":false
to specify no output should be added to the current project.

10 years ago3342: Fix links to log files to use portable_data_hash. Remove spurious puts.
Peter Amstutz [Wed, 27 Aug 2014 13:07:30 +0000 (09:07 -0400)]
3342: Fix links to log files to use portable_data_hash.  Remove spurious puts.
Improve error logging.

10 years ago3414: rename replicator to pull_list
Tim Pierce [Wed, 27 Aug 2014 01:18:51 +0000 (21:18 -0400)]
3414: rename replicator to pull_list

Renamed replicator.Replicator to pull_list.Manager.

10 years ago3414: update for code review
Tim Pierce [Wed, 27 Aug 2014 00:50:01 +0000 (20:50 -0400)]
3414: update for code review

Added logging for pull lists.  Unsuccessful pull lists are logged with
an error, successful ones are logged with the new pull list.

Renamed the Replicator interface with GetList and SetList.

10 years agoMerge branch '3354-render-textile' closes #3354
Tom Clegg [Wed, 27 Aug 2014 00:26:02 +0000 (20:26 -0400)]
Merge branch '3354-render-textile' closes #3354

10 years ago3354: Merge branch 'master' into 3354-render-textile
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

10 years agoFix label for API endpoint. Re-order fields. refs #3112
Tom Clegg [Tue, 26 Aug 2014 22:57:37 +0000 (18:57 -0400)]
Fix label for API endpoint. Re-order fields. refs #3112

10 years agoEnsure source_version is a string, even when it consists entirely of decimal digits...
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

10 years agoRun the task setup script inside the container (if any), instead of
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 #

10 years agoMerge branch '3627-selectable-projects' closes #3627
Tom Clegg [Tue, 26 Aug 2014 23:51:26 +0000 (19:51 -0400)]
Merge branch '3627-selectable-projects' closes #3627