projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3193-manage-account
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
users_controller.rb
diff --git
a/apps/workbench/app/controllers/users_controller.rb
b/apps/workbench/app/controllers/users_controller.rb
index 3bcb956b97893b62c71e53b01ca7089859f4a8be..67b51a9bc9d043513c82fb6d8b2145a4f0462e68 100644
(file)
--- a/
apps/workbench/app/controllers/users_controller.rb
+++ b/
apps/workbench/app/controllers/users_controller.rb
@@
-257,10
+257,10
@@
class UsersController < ApplicationController
key_params['authorized_user_uuid'] = current_user.uuid
if params['name'] && params['name'].size>0
key_params['authorized_user_uuid'] = current_user.uuid
if params['name'] && params['name'].size>0
- key_params['name'] = params['name']
+ key_params['name'] = params['name']
.strip
end
if params['public_key'] && params['public_key'].size>0
end
if params['public_key'] && params['public_key'].size>0
- key_params['public_key'] = params['public_key']
+ key_params['public_key'] = params['public_key']
.strip
end
if !key_params['name'] && params['public_key'].andand.size>0
end
if !key_params['name'] && params['public_key'].andand.size>0