git.arvados.org - arvados.git/commit

projects / arvados.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4177bcc 506e567)

author	Peter Amstutz <peter.amstutz@curoverse.com>
	Fri, 11 Apr 2014 13:44:13 +0000 (09:44 -0400)
committer	Peter Amstutz <peter.amstutz@curoverse.com>
	Fri, 11 Apr 2014 13:44:13 +0000 (09:44 -0400)
commit	4f552c0187f8c31d94ff74485c57ef7f9888597e
tree	861942ea79c782d8aae0214da74a8d169cc10b1e	tree \| snapshot
parent	4177bcc9b935391630c874a2abcedb81efa350f0	commit \| diff
parent	506e5678188ff5a51d4e38558fe8fc0fb4357be2	commit \| diff

Merged master

14 files changed:

apps/workbench/app/assets/javascripts/application.js	diff1 \|	diff2 \|	blob \| history
apps/workbench/app/controllers/users_controller.rb	diff1 \|	diff2 \|	blob \| history
apps/workbench/app/models/arvados_base.rb	diff1 \|	diff2 \|	blob \| history
doc/api/schema/Link.html.textile.liquid	diff1 \|	diff2 \|	blob \| history
doc/api/schema/Log.html.textile.liquid	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/arvados/v1/jobs_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/arvados/v1/users_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/arvados_model.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/job.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/user.rb	diff1 \|	diff2 \|	blob \| history
services/api/db/schema.rb	diff1 \|	diff2 \|	blob \| history
services/api/test/fixtures/links.yml	diff1 \|	diff2 \|	blob \| history
services/api/test/integration/permissions_test.rb	diff1 \|	diff2 \|	blob \| history