projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11308: Merge branch 'master' into 11308-python3
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
virtual_machines_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb
b/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb
index e6474aa4e0328a6759039921b9962d627b0b374d..99b663da43b8d05fde6db0966fe5da515fdc0d84 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/virtual_machines_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/virtual_machines_controller.rb
@@
-23,7
+23,7
@@
class Arvados::V1::VirtualMachinesController < ApplicationController
@users = {}
User.eager_load(:authorized_keys).
where('users.uuid in (?)',
@users = {}
User.eager_load(:authorized_keys).
where('users.uuid in (?)',
- @vms.map { |vm| vm.login_permissions.map
&:tail_uuid
}.flatten.uniq).
+ @vms.map { |vm| vm.login_permissions.map
(&:tail_uuid)
}.flatten.uniq).
each do |u|
@users[u.uuid] = u
end
each do |u|
@users[u.uuid] = u
end