Merge branch 'master' into 3187-pipeline-instance-page
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 19 Sep 2014 19:26:30 +0000 (15:26 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 19 Sep 2014 19:26:30 +0000 (15:26 -0400)
commit7178ac911e7b160c1348da404b5aa07b9829d3c8
tree15b8538852f207ebd70e37ca94f5537005d79226
parenta3f380f9dfe25c1c28e6354de56d93b5c9265a08
parentfe59fe52fd8d10f79b863022dbac6426082dfa46
Merge branch 'master' into 3187-pipeline-instance-page

Conflicts:
apps/workbench/app/models/job.rb
apps/workbench/app/views/application/_content.html.erb
services/api/app/models/job.rb
apps/workbench/app/assets/javascripts/tab_panes.js
apps/workbench/app/models/job.rb
apps/workbench/app/views/application/_content.html.erb
apps/workbench/app/views/pipeline_instances/show.html.erb
apps/workbench/test/integration/pipeline_instances_test.rb