Merge branch '3187-pipeline-instance-page' into 3605-improved-dashboard
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 19 Sep 2014 19:40:53 +0000 (15:40 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 19 Sep 2014 19:40:53 +0000 (15:40 -0400)
commit44d97727200a7efecd115cd01fb520f371ebfe3b
treed37be9c963981af8f656665e72bbe76850f6e48c
parenta6809bec920bdfdfc03c726d0808e696824289f5
parent40b15ddcdcb8314f0a1036de6238d0ca4bfb3e41
Merge branch '3187-pipeline-instance-page' into 3605-improved-dashboard

Conflicts:
apps/workbench/app/models/job.rb
apps/workbench/app/models/job.rb
apps/workbench/test/integration/projects_test.rb