Merge branch 'master' into 3112-report-bug. Also, break search testing into a separat...

[arvados.git] / services / api / app / controllers / arvados / v1 / users_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb
index c32ad0b4c922dfebab30a25ff03e2dd1e2716829..271299b6c97608c68b14d0500e86d779ba610b3d 100644 (file)
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -114,18 +114,25 @@ class Arvados::V1::UsersController < ApplicationController
     show
   end
 
-  # update profile for the user
-  def profile
-    reload_object_before_update
-    @object.profile params
-    show
-  end
-
   protected
 
   def self._setup_requires_parameters
     {
-      send_notification_email: { type: 'boolean', required: true },
+      user: {
+        type: 'object', required: false
+      },
+      openid_prefix: {
+        type: 'string', required: false
+      },
+      repo_name: {
+        type: 'string', required: false
+      },
+      vm_uuid: {
+        type: 'string', required: false
+      },
+      send_notification_email: {
+        type: 'boolean', required: false, default: false
+      },
     }
   end