From 4b4bb33aca0e12ae06bce395f02031890d6ef8bc Mon Sep 17 00:00:00 2001
From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Fri, 4 May 2018 15:09:46 -0400
Subject: [PATCH] 12626: Advertise required params for users#merge in discovery
 doc.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---
 .../app/controllers/arvados/v1/users_controller.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb
index f473b922a5..d2126ec5f7 100644
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -165,6 +165,20 @@ class Arvados::V1::UsersController < ApplicationController
 
   protected
 
+  def self._merge_requires_parameters
+    {
+      new_owner_uuid: {
+        type: 'string', required: true,
+      },
+      new_user_token: {
+        type: 'string', required: true,
+      },
+      redirect_to_new_user: {
+        type: 'boolean', required: false,
+      },
+    }
+  end
+
   def self._setup_requires_parameters
     {
       user: {
-- 
2.30.2