projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2449-keep-write-blocks' into 2449-keep-index-status-handlers
[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 0934642261bb314fdfbf76175251a2d702fb3a6b..de067ce015136f7a3ea6a0f7fbf400021b4d7ba1 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/users_controller.rb
@@
-59,7
+59,7
@@
class Arvados::V1::UsersController < ApplicationController
"but is not invited"
raise ArgumentError.new "Cannot activate without being invited."
end
"but is not invited"
raise ArgumentError.new "Cannot activate without being invited."
end
- act_as_system_user do
+ act_as_system_user do
required_uuids = Link.where("owner_uuid = ? and link_class = ? and name = ? and tail_uuid = ? and head_uuid like ?",
system_user_uuid,
'signature',
required_uuids = Link.where("owner_uuid = ? and link_class = ? and name = ? and tail_uuid = ? and head_uuid like ?",
system_user_uuid,
'signature',
@@
-130,7
+130,7
@@
class Arvados::V1::UsersController < ApplicationController
params[:repo_name], params[:vm_uuid]
end
params[:repo_name], params[:vm_uuid]
end
- render json: { kind: "arvados#HashList", items: @response }
+ render json: { kind: "arvados#HashList", items: @response
.as_api_response(nil)
}
end
# delete user agreements, vm, repository, login links; set state to inactive
end
# delete user agreements, vm, repository, login links; set state to inactive