git.arvados.org - arvados.git/commit

]> git.arvados.org - arvados.git/commit

author	Phil Hodgson <bitbucket@philhodgson.net>
	Fri, 31 Oct 2014 12:56:01 +0000 (13:56 +0100)
committer	Phil Hodgson <bitbucket@philhodgson.net>
	Fri, 31 Oct 2014 12:56:18 +0000 (13:56 +0100)
commit	e3e54264e8bc767e1ec773cff4e5bdf4c4934a36
tree	92f6797692f3b8015c8fe2c38b5a65268e1d162a	tree \| snapshot
parent	c10b68e95cd648caade631ca9bdeceba8e707384	commit \| diff
parent	c6a03a7abff947dc8242e8be18b4b5e6920a3e4a	commit \| diff

Merge branch 'master' into 3618-column-ordering

Conflicts (all resolved including fixes):
apps/workbench/app/controllers/projects_controller.rb
apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
apps/workbench/app/views/projects/_show_tab_contents.html.erb
services/api/app/controllers/arvados/v1/groups_controller.rb

RSS Atom

apps/workbench/app/controllers/projects_controller.rb	diff1 \|	diff2 \|	blob \| history
apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb	diff1 \|	diff2 \|	blob \| history
apps/workbench/app/views/projects/_show_tab_contents.html.erb	diff1 \|	diff2 \|	blob \| history
apps/workbench/test/integration/projects_test.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/arvados/v1/groups_controller.rb	diff1 \|	diff2 \|	blob \| history