projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '18947-githttpd'
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
groups_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/groups_controller.rb
b/services/api/app/controllers/arvados/v1/groups_controller.rb
index c1dc7a49612162aa9fcc79211c4358e77005da5b..3473c7e4e0c361e3c594569f83178e2ea18ebed2 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/groups_controller.rb
@@
-103,7
+103,7
@@
class Arvados::V1::GroupsController < ApplicationController
def destroy
if !TRASHABLE_CLASSES.include?(@object.group_class)
-
return
@object.destroy
+ @object.destroy
show
else
super # Calls destroy from TrashableController module