Merge branch 'master' of ssh://bitbucket.org/yackob03/quay
Conflicts: endpoints/api.py
This commit is contained in:
commit
e90f9b37d4
4 changed files with 25 additions and 9 deletions
|
@ -348,7 +348,7 @@ def delete_permissions(namespace, repository, username):
|
|||
abort(403) # Permission denied
|
||||
|
||||
|
||||
def subscription_view(stripe_subscription, used_repos):
|
||||
def subscription_view(stripe_subscription, used_repos):
|
||||
return {
|
||||
'currentPeriodStart': stripe_subscription.current_period_start,
|
||||
'currentPeriodEnd': stripe_subscription.current_period_end,
|
||||
|
@ -420,4 +420,4 @@ def cancel_subscription():
|
|||
cus.cancel_subscription()
|
||||
return make_response('Deleted', 204)
|
||||
|
||||
abort(404)
|
||||
abort(404)
|
||||
|
|
Reference in a new issue