projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into 0000-workbench-user-profile-wording-changes
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
collections_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/collections_controller.rb
b/services/api/app/controllers/arvados/v1/collections_controller.rb
index 7bc207f0226a5f247e0b2c14aa5870ee994e4bba..54f09828f5ea29d9d17c09dc6ef7f8c85831ceaa 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/collections_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/collections_controller.rb
@@
-54,7
+54,7
@@
class Arvados::V1::CollectionsController < ApplicationController
when String
if m = /[a-f0-9]{32}\+\d+/.match(sp)
yield m[0], nil
- elsif m =
/[0-9a-z]{5}-4zz18-[0-9a-z]{15}/
.match(sp)
+ elsif m =
Collection.uuid_regex
.match(sp)
yield nil, m[0]
end
end