Merge branch 'master' of https://bitbucket.org/yackob03/quay
This commit is contained in:
commit
038e9afc97
7 changed files with 68 additions and 4 deletions
|
@ -7,6 +7,7 @@ from functools import wraps
|
|||
from data import model
|
||||
from app import app
|
||||
from util.names import parse_repository_name
|
||||
from util.gravatar import compute_hash
|
||||
from auth.permissions import (ReadRepositoryPermission,
|
||||
ModifyRepositoryPermission,
|
||||
AdministerRepositoryPermission)
|
||||
|
@ -15,6 +16,11 @@ from auth.permissions import (ReadRepositoryPermission,
|
|||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@app.errorhandler(model.DataModelException)
|
||||
def handle_dme(ex):
|
||||
return make_response(ex.message, 400)
|
||||
|
||||
|
||||
@app.route('/api/')
|
||||
def welcome():
|
||||
return make_response('welcome', 200)
|
||||
|
@ -29,6 +35,7 @@ def get_logged_in_user():
|
|||
'anonymous': False,
|
||||
'username': user.username,
|
||||
'email': user.email,
|
||||
'gravatar': compute_hash(user.email),
|
||||
})
|
||||
|
||||
|
||||
|
|
Reference in a new issue