git.arvados.org - arvados.git/commit

author	Tom Clegg <tclegg@veritasgenetics.com>
	Wed, 2 May 2018 20:12:15 +0000 (16:12 -0400)
committer	Tom Clegg <tclegg@veritasgenetics.com>
	Wed, 2 May 2018 20:12:15 +0000 (16:12 -0400)
commit	49fb55aa1a9fb35d8e7e620717cb42f77d448a43
tree	24f562b80c7effa33df398266d50b88170762a03	tree \| snapshot
parent	dc0dae1ac6d799841dffb828a468a062a4935cc4	commit \| diff

12626: Add arvados/v1/users/merge API.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

services/api/app/controllers/arvados/v1/users_controller.rb		diff \| blob \| history
services/api/app/controllers/user_sessions_controller.rb		diff \| blob \| history
services/api/app/models/api_client_authorization.rb		diff \| blob \| history
services/api/app/models/user.rb		diff \| blob \| history
services/api/config/routes.rb		diff \| blob \| history
services/api/db/migrate/20180501182859_add_redirect_to_user_uuid_to_users.rb	[new file with mode: 0644]	blob
services/api/db/structure.sql		diff \| blob \| history
services/api/test/functional/arvados/v1/users_controller_test.rb		diff \| blob \| history
services/api/test/integration/users_test.rb		diff \| blob \| history