git.arvados.org - arvados.git/commit

author	radhika <radhika@curoverse.com>
	Fri, 30 Jun 2017 17:25:31 +0000 (13:25 -0400)
committer	radhika <radhika@curoverse.com>
	Fri, 30 Jun 2017 17:25:31 +0000 (13:25 -0400)
commit	0561bd0c3c07257fd58ded6c7cfa5feeae97af57
tree	3b667117b002c018c56f691e4c8a45a21f729994	tree \| snapshot
parent	5536864737f7729775f9b2ee95516d6df5053451	commit \| diff
parent	32c2f3d808e0d4938f6a17b778c38f6d1ecd2f82	commit \| diff

Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika@curoverse.com>

Merge branch 'master' into 11870-repositories-index

Conflicts:
apps/workbench/app/views/repositories/_show_help.html.erb
apps/workbench/app/views/users/_repositories.html.erb
apps/workbench/app/views/users/repositories.html.erb

RSS Atom

apps/workbench/app/controllers/repositories_controller.rb	diff1 \|	diff2 \|	blob \| history
apps/workbench/app/controllers/users_controller.rb	diff1 \|	diff2 \|	blob \| history
apps/workbench/app/views/layouts/body.html.erb	diff1 \|	diff2 \|	blob \| history
apps/workbench/app/views/repositories/_add_repository_modal.html.erb	diff1 \|	diff2 \|	blob \| history
apps/workbench/app/views/repositories/_show_help.html.erb	diff1 \|	diff2 \|	blob \| history
apps/workbench/test/controllers/repositories_controller_test.rb	diff1 \|	diff2 \|	blob \| history
apps/workbench/test/controllers/users_controller_test.rb	diff1 \|	diff2 \|	blob \| history
apps/workbench/test/integration/application_layout_test.rb	diff1 \|	diff2 \|	blob \| history
apps/workbench/test/integration/user_settings_menu_test.rb	diff1 \|	diff2 \|	blob \| history