From: Tom Clegg <tom@curoverse.com>
Date: Mon, 11 Aug 2014 23:01:08 +0000 (-0400)
Subject: 3178: Merge bogus _setup_requires_parameters into existing class method.
X-Git-Tag: 1.1.0~2342^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/2bec2ba1ce3b37fb8ff9a94f20d6c8a694d87183

3178: Merge bogus _setup_requires_parameters into existing class method.
---

diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb
index 1b2c6f4b20..271299b6c9 100644
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -57,26 +57,6 @@ class Arvados::V1::UsersController < ApplicationController
     show
   end
 
-  def _setup_requires_parameters
-    {
-      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
-
   # create user object and all the needed links
   def setup
     @object = nil
@@ -138,7 +118,21 @@ class Arvados::V1::UsersController < ApplicationController
 
   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