Merge branch 'orgs' of https://bitbucket.org/yackob03/quay into orgs
This commit is contained in:
commit
17a07ea6e0
2 changed files with 2 additions and 2 deletions
|
@ -120,8 +120,9 @@ class ViewTeamPermission(Permission):
|
|||
team_admin = _TeamNeed(org_name, team_name, 'admin')
|
||||
team_creator = _TeamNeed(org_name, team_name, 'creator')
|
||||
team_member = _TeamNeed(org_name, team_name, 'member')
|
||||
admin_org = _OrganizationNeed(org_name, 'admin')
|
||||
super(ViewTeamPermission, self).__init__(team_admin, team_creator,
|
||||
team_member)
|
||||
team_member, admin_org)
|
||||
|
||||
|
||||
@identity_loaded.connect_via(app)
|
||||
|
|
|
@ -168,7 +168,6 @@ def github_oauth_callback():
|
|||
if common_login(to_login):
|
||||
return redirect(url_for('index'))
|
||||
|
||||
# TODO something bad happened, we need to tell the user somehow
|
||||
return render_template('githuberror.html')
|
||||
|
||||
|
||||
|
|
Reference in a new issue