Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 25 Feb 2014 21:12:21 +0000 (16:12 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 25 Feb 2014 21:12:21 +0000 (16:12 -0500)
commitda2803a65e696bf85883e82a0bda6ef81dda5429
treec90206bf06b299f9e24f6e56a0b8f17c5dbc9094
parentb354e03622eb2e47c055b6fcc38b24c22a59ab9f
parentce3845c8ce108518832ea6ad9a10bb9b98a48174
Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench
apps/workbench/app/assets/javascripts/application.js
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/views/collections/_index_tbody.html.erb
apps/workbench/app/views/collections/_show_recent.html.erb
apps/workbench/app/views/pipeline_instances/_show_components.html.erb