Merge branch 'master' into 4024-pipeline-instances-scroll
authorradhika <radhika@curoverse.com>
Fri, 14 Nov 2014 19:07:17 +0000 (14:07 -0500)
committerradhika <radhika@curoverse.com>
Fri, 14 Nov 2014 19:07:17 +0000 (14:07 -0500)
commit8b7ed36ff057c4a483f4ee8a1c66929425b366c6
tree602c8bd1844003792228d704863d6c71ee002133
parentbc4992f9e11cd0639cf6461736963d66830c5af8
parent3a31350c6265cb1135d3d4d40af436aae91a9894
Merge branch 'master' into 4024-pipeline-instances-scroll
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/controllers/pipeline_instances_controller.rb
apps/workbench/test/integration/pipeline_instances_test.rb