Merge remote-tracking branch 'upstream/master' into torrent

This commit is contained in:
Jake Moshenko 2016-01-08 15:43:12 -05:00
commit b9821290f6
3 changed files with 18 additions and 3 deletions

View file

@ -331,8 +331,9 @@ class Repository(RepositoryParamResource):
""" Delete a repository. """
model.repository.purge_repository(namespace, repository)
user = model.user.get_namespace_user(namespace)
plan = get_namespace_plan(namespace)
check_repository_usage(user, plan)
if features.BILLING:
plan = get_namespace_plan(namespace)
check_repository_usage(user, plan)
log_action('delete_repo', namespace,
{'repo': repository, 'namespace': namespace})
return 'Deleted', 204