projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'thehyve/master' LocalJumpError in arvados-login-sync
[arvados.git]
/
services
/
api
/
lib
/
trashable.rb
diff --git
a/services/api/lib/trashable.rb
b/services/api/lib/trashable.rb
index 38ebaf7a8bfb5ca483c4b5b4df7d89585b5ff60c..96879629646b7e413e3c1e6c3e2110d7de0d7173 100644
(file)
--- a/
services/api/lib/trashable.rb
+++ b/
services/api/lib/trashable.rb
@@
-120,7
+120,7
@@
module TrashableController
@object.save!
end
else
- raise
InvalidStateTransitionError
+ raise
ArvadosModel::InvalidStateTransitionError.new("Item is not trashed, cannot untrash")
end
show
end