git.arvados.org - arvados.git/commit

author	radhika <radhika@curoverse.com>
	Wed, 20 Aug 2014 14:31:50 +0000 (10:31 -0400)
committer	radhika <radhika@curoverse.com>
	Wed, 20 Aug 2014 14:31:50 +0000 (10:31 -0400)
commit	e824ef364a6efd3c02bce159973f4098d794865c
tree	fd6f35462d69340cffad3d771fa1116d9c18da4a	tree \| snapshot
parent	a9170bf25717112dee4c42b095865fcbe5794e70	commit \| diff
parent	6b0ad588b44ee30cd400e85031b56dcb2a8ac567	commit \| diff

Merge branch 'master' into 3112-report-bug. Also, break search testing into a separate project.

Conflicts:
apps/workbench/app/controllers/application_controller.rb
apps/workbench/config/application.default.yml
apps/workbench/test/integration/application_layout_test.rb

RSS Atom

apps/workbench/app/controllers/actions_controller.rb	diff1 \|	diff2 \|	blob \| history
apps/workbench/app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
apps/workbench/config/application.default.yml	diff1 \|	diff2 \|	blob \| history
apps/workbench/config/routes.rb	diff1 \|	diff2 \|	blob \| history
apps/workbench/test/integration/application_layout_test.rb	diff1 \|	diff2 \|	blob \| history
apps/workbench/test/integration/report_issue_test.rb	\|	\|	blob
apps/workbench/test/integration/search_box_test.rb	\|	\|	blob