Merge remote-tracking branch 'origin/master' into swaggerlikeus

Conflicts:
	data/database.py
	endpoints/api.py
	endpoints/common.py
	templates/base.html
	test/data/test.db
	test/specs.py
This commit is contained in:
jakedt 2014-03-19 15:39:44 -04:00
commit c93c62600d
59 changed files with 4636 additions and 216 deletions

View file

@ -29,7 +29,7 @@ def image_view(image):
}
@resource('/v1/repository/<path:repository>/image/')
@resource('/v1/repository/<repopath:repository>/image/')
class RepositoryImageList(RepositoryParamResource):
""" Resource for listing repository images. """
@require_repo_read
@ -54,7 +54,7 @@ class RepositoryImageList(RepositoryParamResource):
}
@resource('/v1/repository/<path:repository>/image/<image_id>')
@resource('/v1/repository/<repopath:repository>/image/<image_id>')
class RepositoryImage(RepositoryParamResource):
""" Resource for handling repository images. """
@require_repo_read
@ -68,7 +68,7 @@ class RepositoryImage(RepositoryParamResource):
return image_view(image)
@resource('/v1/repository/<path:repository>/image/<image_id>/changes')
@resource('/v1/repository/<repopath:repository>/image/<image_id>/changes')
class RepositoryImageChanges(RepositoryParamResource):
""" Resource for handling repository image change lists. """